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

me, too :) I remember doing almost the same thing in the last github days, but it failed for some reason, glad it works now.