Make sure FileNotFoundExceptions are handled same as before