diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 3f9c2e387..3041e6e0e 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -902,19 +902,16 @@ help_deposit (struct CoinHistoryParseContext *pc,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if (NULL != pc->dk)
+  /* check that deposit fee matches our expectations from /keys! */
+  if ( (GNUNET_YES !=
+        TALER_amount_cmp_currency (&deposit_fee,
+                                   &pc->dk->fees.deposit)) ||
+       (0 !=
+        TALER_amount_cmp (&deposit_fee,
+                          &pc->dk->fees.deposit)) )
   {
-    /* check that deposit fee matches our expectations from /keys! */
-    if ( (GNUNET_YES !=
-          TALER_amount_cmp_currency (&deposit_fee,
-                                     &pc->dk->fees.deposit)) ||
-         (0 !=
-          TALER_amount_cmp (&deposit_fee,
-                            &pc->dk->fees.deposit)) )
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
   }
   return GNUNET_YES;
 }
diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index 819312f69..9cfc14a4e 100644
--- a/src/util/taler-exchange-secmod-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -1630,7 +1630,6 @@ import_key (void *cls,
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "open",
                               filename);
-    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (0 != fstat (fd,