Add more reinforcement around encrypt/decrypt