fix bug 1072380 - make sure we raise validation error at the right spot of the call chain

:heart: this refactor.