travelhacking

2 files changed, 5 insertions, 2 deletions

diff --git a/src/arm/arm.h b/src/arm/arm.h
index 2293ec036..a8f5d0706 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -27,6 +27,6 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_ARM GNUNET_NO
+#define DEBUG_ARM GNUNET_YES
 
 #endif
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 32674117c..ac58904ed 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -167,6 +167,8 @@ signal_result (struct GNUNET_SERVER_Client *client,
 {
   uint16_t *res;
 
+  if (NULL == client)
+    return;
 #if DEBUG_ARM
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Telling client that service `%s' is now %s\n",
@@ -387,7 +389,8 @@ start_service (struct GNUNET_SERVER_Client *client, const char *servicename)
   sl->mtime = sbuf.st_mtime;
   running = sl;
   start_process (sl);
-  signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
+  if (NULL != client)
+    signal_result (client, servicename, GNUNET_MESSAGE_TYPE_ARM_IS_UP);
 }