Merge "Check for null pointer when parsing identities."