diff --git a/libuavcan/src/node/global_data_type_registry.cpp b/libuavcan/src/node/global_data_type_registry.cpp
index 3d41c08ede..d9d2b3ecf1 100644
--- a/libuavcan/src/node/global_data_type_registry.cpp
+++ b/libuavcan/src/node/global_data_type_registry.cpp
@@ -124,6 +124,11 @@ void GlobalDataTypeRegistry::freeze()
 
 const DataTypeDescriptor* GlobalDataTypeRegistry::find(DataTypeKind kind, const char* name) const
 {
+    if (!name)
+    {
+        assert(0);
+        return NULL;
+    }
     const List* list = selectList(kind);
     if (!list)
     {