diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs
index 6356cb3f..06e887bf 100644
--- a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs
+++ b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs
@@ -3070,6 +3070,11 @@ private string GetValidIdentifier(string name)
             isFirst = false;
         }
 
+        if (validName.Length < 1)
+        {
+            throw new Exception($"Failed to make valid identifier for '{name}'");
+        }
+
         if (!char.IsLetter(validName[0]) && validName[0] != DefaultPrefixCharacter)
         {
             validName.Insert(0, DefaultPrefixCharacter);
diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude
index ebe7c282..bda70d82 100644
--- a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude
+++ b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude
@@ -2925,6 +2925,11 @@ public abstract class ODataClientTemplate : TemplateBase
             isFirst = false;
         }
 
+        if (validName.Length < 1)
+        {
+            throw new Exception($"Failed to make valid identifier for '{name}'");
+        }
+
         if (!char.IsLetter(validName[0]) && validName[0] != DefaultPrefixCharacter)
         {
             validName.Insert(0, DefaultPrefixCharacter);