2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/openpgp/src/account_settings_entry.vala b/plugins/openpgp/src/account_settings_entry.vala
index d2e5ac23..7c99942f 100644
--- a/plugins/openpgp/src/account_settings_entry.vala
+++ b/plugins/openpgp/src/account_settings_entry.vala
@@ -116,8 +116,10 @@ public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
         SourceFunc callback = fetch_keys.callback;
         new Thread<void*> (null, () => { // Querying GnuPG might take some time
             try {
-            keys = GPGHelper.get_keylist(null, true);
-        } catch (Error e) { }
+                keys = GPGHelper.get_keylist(null, true);
+            } catch (Error e) {
+                warning(e.message);
+            }
             Idle.add((owned)callback);
             return null;
         });
diff --git a/plugins/openpgp/src/gpgme_helper.vala b/plugins/openpgp/src/gpgme_helper.vala
index f28bc6d6..18d07c06 100644
--- a/plugins/openpgp/src/gpgme_helper.vala
+++ b/plugins/openpgp/src/gpgme_helper.vala
@@ -117,6 +117,7 @@ public static Gee.List<Key> get_keylist(string? pattern = null, bool secret_only
         } catch (Error e) {
             if (e.code != GPGError.ErrorCode.EOF) throw e;
         }
+        context.op_keylist_end();
         return keys;
     } finally {
         global_mutex.unlock();