Added error handling for 404