Merge "Fix null pointer dereference when security exception occurs"