set filehandle name, and validate
Merge pull request #1327 from jay-hodgson/SWC-1930

SWC-1930: set filehandle name, and validate