Added server-side Validation for #149