diff --git a/server/TracyStringDiscovery.hpp b/server/TracyStringDiscovery.hpp
index 066c4422..449b6f09 100644
--- a/server/TracyStringDiscovery.hpp
+++ b/server/TracyStringDiscovery.hpp
@@ -53,8 +53,11 @@ public:
             if( pit == m_pending.end() )
             {
                 T item = Create( name );
-                m_pending.emplace( name, item );
-                Query( name );
+                if( item )
+                {
+                    m_pending.emplace( name, item );
+                    Query( name );
+                }
                 return item;
             }
             else