diff --git a/src/bank-lib/taler-exchange-wire-gateway-client.c b/src/bank-lib/taler-exchange-wire-gateway-client.c
index 935506f71..c69c32c47 100644
--- a/src/bank-lib/taler-exchange-wire-gateway-client.c
+++ b/src/bank-lib/taler-exchange-wire-gateway-client.c
@@ -181,10 +181,20 @@ credit_history_cb (void *cls,
          (TALER_EC_NONE != ec) ||
          (NULL == details) )
     {
-      fprintf (stderr,
-               "Failed to obtain credit history: %u/%d\n",
-               http_status,
-               ec);
+      if (0 == http_status)
+      {
+        fprintf (stderr,
+                 "Failed to obtain HTTP reply from `%s'\n",
+                 auth.wire_gateway_url);
+      }
+      else
+      {
+        fprintf (stderr,
+                 "Failed to obtain credit history from `%s': HTTP status %u (%s)\n",
+                 auth.wire_gateway_url,
+                 http_status,
+                 TALER_ErrorCode_get_hint (ec));
+      }
       if (NULL != json)
         json_dumpf (json,
                     stderr,
@@ -277,16 +287,27 @@ debit_history_cb (void *cls,
 {
   (void) cls;
 
+  dhh = NULL;
   if (MHD_HTTP_OK != http_status)
   {
     if ( (MHD_HTTP_NO_CONTENT != http_status) ||
          (TALER_EC_NONE != ec) ||
          (NULL == details) )
     {
-      fprintf (stderr,
-               "Failed to obtain debit history: %u/%d\n",
-               http_status,
-               ec);
+      if (0 == http_status)
+      {
+        fprintf (stderr,
+                 "Failed to obtain HTTP reply from `%s'\n",
+                 auth.wire_gateway_url);
+      }
+      else
+      {
+        fprintf (stderr,
+                 "Failed to obtain debit history from `%s': HTTP status %u (%s)\n",
+                 auth.wire_gateway_url,
+                 http_status,
+                 TALER_ErrorCode_get_hint (ec));
+      }
       if (NULL != json)
         json_dumpf (json,
                     stderr,
diff --git a/src/bank-lib/taler-fakebank-run.c b/src/bank-lib/taler-fakebank-run.c
index 5aa8650a0..ff9dcc17c 100644
--- a/src/bank-lib/taler-fakebank-run.c
+++ b/src/bank-lib/taler-fakebank-run.c
@@ -42,6 +42,25 @@ static int connection_close;
  */
 static int ret;
 
+/**
+ * Handle for the service.
+ */
+static struct TALER_FAKEBANK_Handle *fb;
+
+
+/**
+ * Stop the process.
+ *
+ * @param cls NULL
+ */
+static void
+do_shutdown (void *cls)
+{
+  (void) cls;
+  TALER_FAKEBANK_stop (fb);
+  fb = NULL;
+}
+
 
 /**
  * Main function that will be run.
@@ -69,7 +88,7 @@ run (void *cls,
       TALER_config_get_currency (cfg,
                                  &currency_string))
   {
-    ret = 1;
+    ret = EXIT_NOTCONFIGURED;
     return;
   }
   if (GNUNET_OK !=
@@ -92,15 +111,20 @@ run (void *cls,
                 "Maximum transaction history in RAM set to default of %llu\n",
                 ram);
   }
-  if (NULL ==
-      TALER_FAKEBANK_start2 ((uint16_t) port,
-                             currency_string,
-                             ram,
-                             num_threads,
-                             (0 != connection_close) ))
-    ret = 1;
+  fb = TALER_FAKEBANK_start2 ((uint16_t) port,
+                              currency_string,
+                              ram,
+                              num_threads,
+                              (0 != connection_close));
+  if (NULL == fb)
+  {
+    ret = EXIT_FAILURE;
+    return;
+  }
   GNUNET_free (currency_string);
-  ret = 0;
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+  ret = EXIT_SUCCESS;
 }
 
 
@@ -135,6 +159,6 @@ main (int argc,
                           options,
                           &run,
                           NULL))
-    return 1;
+    return EXIT_INVALIDARGUMENT;
   return ret;
 }