Improved handling of 404 errors
1.5.1