Improve FileNameOption error handling