If field is required and empty, then set error

(pulled from st4lk's repo. The other commit seemed extraneous)