2 files changed, 7 insertions, 3 deletions

diff --git a/src/core/core_api.c b/src/core/core_api.c
index a2e0dae09..f4a197909 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1728,6 +1728,10 @@ GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
   struct GNUNET_CORE_PeerRequestHandle *ret;
   struct ControlMessage *cm;
   struct ConnectMessage *msg;
+
+  if (NULL != GNUNET_CONTAINER_multihashmap_get (h->peers,
+                                          &peer->hashPubKey))
+    GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "core_api", "Received CONNECT requests for already connected peer!\n");
   
   cm = GNUNET_malloc (sizeof (struct ControlMessage) + 
                       sizeof (struct ConnectMessage));
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 410d65b93..4519991b3 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3336,9 +3336,9 @@ process_hello_retry_handle_set_key (void *cls,
 
   if (err_msg != NULL)
   {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      _("Error in communication with PEERINFO service\n"));
-        /* return; */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                _("Error in communication with PEERINFO service\n"));
+    /* return; */
   }
 
   if (peer == NULL)