Fixed broken validation

[danielm09]

Fixed "if" statement that was causing the faulty behavior of the validation fuction, where some lines were not being eliminated.