Throw 404 instead of 500 status code...