Empty fields get catched now