diff --git a/CodeBuilder.Framework/TemplateEngine/TemplateDataBuilder.cs b/CodeBuilder.Framework/TemplateEngine/TemplateDataBuilder.cs
index 7118a00..2a37197 100644
--- a/CodeBuilder.Framework/TemplateEngine/TemplateDataBuilder.cs
+++ b/CodeBuilder.Framework/TemplateEngine/TemplateDataBuilder.cs
@@ -100,9 +100,8 @@ private static TemplateData CreateTemplateData<T>(T modelObject, GenerationSetti
 
         private static string GetTemplateDataName(bool isOmitPrefix, bool isCamelCaseName, string tablePrefix, string name)
         {
-            if (isOmitPrefix) name = name.Replace(tablePrefix, "");
+            if (isOmitPrefix && (tablePrefix ?? "").Length > 0) name = name.Replace(tablePrefix, "");
             if (isCamelCaseName) name = name.CamelCaseName();
-
             return name;
         }