Fix NPE in verifier