Merge "Catch SecurityException instead Exception"