Merge "Change to update SecurityException message."