Merge "Better error message if null encryptSalt"