diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
index 688ac24..009bc4b 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/templates/column/js/column.js
@@ -423,7 +423,7 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
               msg = undefined;
 
           // Nothing to validate
-          if (keys.length == 0) {
+          if (keys && keys.length == 0) {
             this.errorModel.clear();
             return null;
           } else {
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
index 56cc0df..b49492a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/templates/index/js/index.js
@@ -301,7 +301,7 @@ function($, _, S, pgAdmin, pgBrowser, Backform, alertify) {
               msg = undefined;
 
           // Nothing to validate
-          if (keys.length == 0) {
+          if (keys && keys.length == 0) {
             this.errorModel.clear();
             return null;
           } else {