scratch that, always call our custom verify
fixup error messages
Merge branch 'master' into MTEVerest