2 files changed, 5 insertions, 3 deletions

diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c
index c0ed073fc..9f9360bfb 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -692,6 +692,7 @@ heap_plugin_get_zero_anonymity (void *cls, uint64_t offset,
     }
     break;
   }
+  GNUNET_assert (NULL != zabt);
   value = zabt->array[offset];
   if (GNUNET_NO ==
       proc (proc_cls, 
diff --git a/src/fs/gnunet-service-fs_stream.c b/src/fs/gnunet-service-fs_stream.c
index 50c9bfcf4..6ec5e6d30 100644
--- a/src/fs/gnunet-service-fs_stream.c
+++ b/src/fs/gnunet-service-fs_stream.c
@@ -847,9 +847,10 @@ GSF_stream_query_cancel (struct GSF_StreamRequest *sr)
   struct StreamHandle *sh = sr->sh;
 
   if (GNUNET_YES == sr->was_transmitted)
-    GNUNET_CONTAINER_multihashmap_remove (sh->waiting_map,
-                                          &sr->query,
-                                          sr);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multihashmap_remove (sh->waiting_map,
+                                                         &sr->query,
+                                                         sr));
   else
     GNUNET_CONTAINER_DLL_remove (sh->pending_head,
                                  sh->pending_tail,