diff --git a/extra/jheidi/createTableEvents.ajl b/extra/jheidi/createTableEvents.ajl
index 4b89c3c8..9a824ab6 100644
--- a/extra/jheidi/createTableEvents.ajl
+++ b/extra/jheidi/createTableEvents.ajl
@@ -177,7 +177,14 @@
       model.add(fieldName);
       l.setSelectedIndex(model.indexOf(fieldName));
     }
-    
+    else if ( fieldName == null || fieldName.trim().length() == 0 )
+    {
+      d.popupMessage("Create Table", "Please enter a field name to add.");
+    }
+    else if ( model.contains(fieldName.trim()) )
+    {
+      d.popupMessage("Create Table", "Field name + " fieldName.trim() + "  already exists in this table.");
+    }
   }
   else if ("Remove".equals(who) )
   {