Extends encryption modules checks
Reduces indentation
Merge pull request #198 from bravo-kernel/encryption-checks

Extends encryption modules checks