Fix NPE in DatabaseValidator