Exception handling updates for FileUtils