no message
Minor changes to error handling and 404 message