Added additional exception handling
FileMap tests added