Throw DecryptException on error, for consistency
Merge pull request #4595 from JamShady/pull-request/throw-decrypt-exception-on-decrypt-error

throw DecryptException on decrypt error (consistency fix)