diff --git a/fas/fas/cla.py b/fas/fas/cla.py
index 7a22001..b12bca6 100644
--- a/fas/fas/cla.py
+++ b/fas/fas/cla.py
@@ -99,12 +99,17 @@ class CLA(controllers.Controller):
         data = StringIO.StringIO(signature.file.read())
         plaintext = StringIO.StringIO()
         verified = False
-        try:
-              subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
-        except subprocess.CalledProcessError:
+        ret = subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+        if ret != 0:
             turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
             turbogears.redirect('/cla/view/sign')
             return dict()
+        #try:
+        #      subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+        #except subprocess.CalledProcessError:
+        #    turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
+        #    turbogears.redirect('/cla/view/sign')
+        #    return dict()
         else:
             try:
                 sigs = ctx.verify(data, None, plaintext)
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 6ca1e6e..be6a57d 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -384,10 +384,15 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
                 # CLA one), think of how to make sure this doesn't get
                 # full of random keys (keep a clean Fedora keyring)
                 # TODO: MIME stuff?
-                try:
-                    subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
-                except subprocess.CalledProcessError:
+                ret = subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+                if ret != 0:
                     turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
+                    turbogears.redirect('/cla/view/sign')
+                    return dict()
+                #try:
+                #    subprocess.check_call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', person.gpg_keyid])
+                #except subprocess.CalledProcessError:
+                #    turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))
                 else:
                     try:
                         plaintext = StringIO.StringIO(mail)