diff --git a/src/common/connection.py b/src/common/connection.py
index cc1c36a29..a6dbb7826 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -294,7 +294,8 @@ class CommonConnection:
             else:
                 def encrypt_thread(msg, keyID, always_trust=False):
                     # encrypt message. This function returns (msgenc, error)
-                    return self.gpg.encrypt(msg, [keyID], always_trust)
+                    return self.gpg.encrypt(msg, [keyID],
+                        always_trust)
                 def _on_encrypted(output):
                     msgenc, error = output
                     if error == 'NOT_TRUSTED':
diff --git a/src/common/gpg.py b/src/common/gpg.py
index 31d865e10..5da4215ee 100644
--- a/src/common/gpg.py
+++ b/src/common/gpg.py
@@ -31,7 +31,6 @@ if HAVE_GPG:
     class GnuPG(gnupg.GPG):
         def __init__(self, use_agent=False):
             gnupg.GPG.__init__(self)
-            gnupg.GPG.decode_errors = 'replace'
             self.passphrase = None
             self.use_agent = use_agent
             self.always_trust = False