diff --git a/TSOClient/tso.content/framework/RuntimeProvider.cs b/TSOClient/tso.content/framework/RuntimeProvider.cs
index 4fb8d1ddd..21522ad35 100644
--- a/TSOClient/tso.content/framework/RuntimeProvider.cs
+++ b/TSOClient/tso.content/framework/RuntimeProvider.cs
@@ -36,9 +36,9 @@ public T Get(uint type, uint fileID)
 
         public T Get(ContentID id)
         {
-            T entry;
-            if (EntriesByName.TryGetValue(id.FileName, out entry)) return entry;
-            return default(T);
+            if (id == null) return default(T);
+            if (id.FileName != null) return Get(id.FileName);
+            return Get(id.TypeID, id.FileID);
         }
 
         public List<IContentReference<T>> List()