Fixed validation without unnecessary putting 500 errors