4 files changed, 8 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index 1a8889fda..bf066d846 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -405,6 +405,7 @@ update_fees (struct WireAccount *wa,
                                      &p->master_sig);
     if (qs < 0)
     {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
       TALER_EXCHANGEDB_fees_free (wa->af);
       wa->af = NULL;
       return NULL;
@@ -854,10 +855,9 @@ deposit_cb (void *cls,
                       au->session);
     if (NULL == af)
     {
-      if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-        qs = GNUNET_DB_STATUS_HARD_ERROR;
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-      return qs;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not get or persist wire fees. Aborting run.\n");
+      return GNUNET_DB_STATUS_HARD_ERROR;
     }
     au->wire_fee = af->wire_fee;
   }
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 153bb19f8..0061ac862 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -615,6 +615,8 @@ handle_mhd_request (void *cls,
       /* strange, should start with '/', treat as just "/" */
       url = "/";
     start = strchr (url + 1, '/');
+    if (NULL == start)
+      start = "";
     ret = proceed_with_handler (ecls->rh,
                                 connection,
                                 start,
diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index add201aa6..9be78e5e4 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -2338,7 +2338,7 @@ TEH_KS_sign (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose,
     /* This *can* happen if the exchange's keys are
        not properly maintained. */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Cannot sign request, no valid keys available\n"));
+                "Cannot sign request, no valid keys available\n");
     return GNUNET_SYSERR;
   }
   *pub = key_state->current_sign_key_issue.issue.signkey_pub;
diff --git a/src/exchange/taler-exchange-httpd_transfers_get.c b/src/exchange/taler-exchange-httpd_transfers_get.c
index 713b43a58..e7fceb494 100644
--- a/src/exchange/taler-exchange-httpd_transfers_get.c
+++ b/src/exchange/taler-exchange-httpd_transfers_get.c
@@ -434,7 +434,7 @@ track_transfer_transaction (void *cls,
   if (0 >= qs)
   {
     if ( (GNUNET_DB_STATUS_HARD_ERROR == qs) ||
-         (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS) )
+         (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) )
     {
       GNUNET_break (0);
       *mhd_ret = TALER_MHD_reply_with_error (connection,