Merge "Don't crash if a null key is passed for verification/parsing"