fix a possible NPE if validation is done too early
1 file changed