Merge "Added NPE check on verifySameType()."