Return 404 instead of 400