diff --git a/src/common/gpg.py b/src/common/gpg.py
index 2f7957626..c95ed2257 100644
--- a/src/common/gpg.py
+++ b/src/common/gpg.py
@@ -31,6 +31,7 @@ if HAVE_GPG:
     class GnuPG(gnupg.GPG):
         def __init__(self, use_agent=False):
             gnupg.GPG.__init__(self)
+            self.decode_errors = 'replace'
             self.passphrase = None
             self.use_agent = use_agent
             self.always_trust = False