Fixed 500 instead of 404