1 files changed, 9 insertions, 1 deletions
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index a39e1032c..50aa85f7b 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1382,8 +1382,9 @@ do_shutdown (void *cls)
   TEH_reserves_get_cleanup ();
   if (NULL != mhd)
     MHD_stop_daemon (mhd);
-  TALER_EXCHANGEDB_plugin_unload (TEH_plugin);
   TEH_WIRE_done ();
+  TEH_keys_finished ();
+  TALER_EXCHANGEDB_plugin_unload (TEH_plugin);
 }
 
 
@@ -1425,6 +1426,13 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
+  if (GNUNET_OK !=
+      TEH_wire_init ())
+  {
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   TEH_load_terms (TEH_cfg);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,