fix early returning from validation in some cases