Fixes for Errors when file doesn't exist