Fixed some issues with FileNotFoundExceptions.