diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 0e52dccfa..0d17d5c5b 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -1164,7 +1164,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("--place missing or invalid.\n"));
-    /* FIXME: why does it segfault here? */
     exit_fail ();
     return;
   }
diff --git a/src/social/social_api.c b/src/social/social_api.c
index af1d6e57e..ad8323d07 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -2693,6 +2693,11 @@ GNUNET_SOCIAL_app_disconnect (struct GNUNET_SOCIAL_App *app,
                               GNUNET_ContinuationCallback disconnect_cb,
                               void *disconnect_cls)
 {
+  if (NULL == app){
+    // Nothing to free here!
+    return;
+  }
+
   app->disconnect_cb = disconnect_cb;
   app->disconnect_cls = disconnect_cls;