1 files changed, 7 insertions, 2 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 17f030a6c..e96197813 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -575,8 +575,13 @@ transmit_req_addr (struct AddressIteration *ai,
   msg->plugin_name_length = htons (plugin_name_length);
   msg->bandwidth_out = bandwidth_out;
   msg->bandwidth_in = bandwidth_in;
-  GNUNET_ATS_properties_hton (&msg->properties,
-                              prop);
+  if (NULL != prop)
+    GNUNET_ATS_properties_hton (&msg->properties,
+                                prop);
+  else
+    memset (&msg->properties,
+            0,
+            sizeof (struct GNUNET_ATS_Properties));
   addrp = (char *) &msg[1];
   if (NULL != plugin_addr)
     memcpy (addrp, plugin_addr, plugin_addr_len);