Refactor: Also pass along original exception in rethrow after decryption failure