diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 91b25e30f75a..2621b96e167b 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -108,8 +108,15 @@ public class CommandName
                     String[] NameList;
                     NameList = new String[0];
                     NameList = JavaTools.ArrayoutofString(_DisplayName, ".");
-                    SchemaName = NameList[0];
-                    TableName = NameList[1]; // TODO Was ist mit diesem Fall: CatalogSep = "." und CatalogName = PropertyNames.EMPTY_STRING
+                    if (NameList.length > 1)
+                    {
+                        SchemaName = NameList[0];
+                        TableName = NameList[1];
+                    }
+                    else
+                    {
+                        TableName = _DisplayName;
+                    }
                 }
                 else
                 {