diff --git a/src/ipc/daemon_ipc_handlers.cpp b/src/ipc/daemon_ipc_handlers.cpp
index 23042267c..b10c327a4 100644
--- a/src/ipc/daemon_ipc_handlers.cpp
+++ b/src/ipc/daemon_ipc_handlers.cpp
@@ -57,9 +57,9 @@ namespace IPC
     {
       p2p = p_p2p;
       core = p_core;
-      /*server = zactor_new (wap_server, NULL);
+      server = zactor_new (wap_server, NULL);
       zsock_send (server, "ss", "BIND", "ipc://@/monero");
-      zsock_send (server, "sss", "SET", "server/timeout", "5000");*/
+      zsock_send (server, "sss", "SET", "server/timeout", "5000");
     }
 
     void start_mining(wap_proto_t *message)
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 9f3be4a06..db2c97d18 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -86,7 +86,9 @@ namespace tools
   public:
     wallet2(bool testnet = false, bool restricted = false) : m_run(true), m_callback(0), m_testnet(testnet) {
       client = wap_client_new ("ipc://@/monero", 200, "wallet identity");
-      assert (client);
+      if (!client) {
+        // TODO: Daemon not up.
+      }
       int rc = wap_client_start (client, 25);
       assert (rc == 0);
     };