2 files changed, 10 insertions, 1 deletions

diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c
index be9cd2ba8..f66d15d82 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -712,7 +712,10 @@ GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer)
                         if (GNUNET_SCHEDULER_NO_TASK != generic_send_delay_task)
                         {
                                         GNUNET_SCHEDULER_cancel (generic_send_delay_task);
-                                        generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining(generic_dqe_head->sent_at), &send_delayed, generic_dqe_head);
+                                        if (NULL != generic_dqe_head)
+                                                generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (
+                                                                GNUNET_TIME_absolute_get_remaining(generic_dqe_head->sent_at),
+                                                                &send_delayed, generic_dqe_head);
                         }
         }
 }
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 42ed771f4..013020680 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -812,6 +812,12 @@ transmit_fragment (void *cls,
   size_t size;
   uint16_t msize;
 
+  if (NULL == endpoint)
+  {
+        GNUNET_break (0);
+        return;
+  }
+
   msize = ntohs (hdr->size);
   size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
   {