am ad2be762: Merge "Fix null pointer dereference when security exception occurs"

* commit 'ad2be762f2f0ff9f3c01e729e307920cef6e2904':
  Fix null pointer dereference when security exception occurs