Merge "Add Extra Exception Checks to Null Cipher Toggle"