#3705 added back message and exceptions for with offending file name