Patch to better implement continueIfEmpty functionality

Old implementation didn't cover all cases where you would want to allow an empty field continue on for further validation.  Thanks to https://github.com/Danizord for the feedback.