Check for null in presence verifier.
Merging 4.0 to master branch.