diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
index 98da604..73ef3ce 100644
--- a/src/vlibapi/api_shared.c
+++ b/src/vlibapi/api_shared.c
@@ -232,7 +232,10 @@
   u16 id = clib_net_to_host_u16 (*((u16 *) msg));
   vl_api_msg_data_t *m = vl_api_get_msg_data (am, id);
 
-  m->endian_handler (tmpmem);
+  if (m && m->endian_handler)
+    {
+      m->endian_handler (tmpmem);
+    }
 
   if (m && m->tojson_handler)
     {