1 files changed, 4 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index e6e8c622f076..d169f7dd951a 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -242,13 +242,16 @@ public class SQLQueryComposer
         }
     }
 
-    public StringBuilder getFromClause()
+    public StringBuilder getFromClause() throws SQLException
     {
         StringBuilder sFromClause = new StringBuilder("FROM");
         String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
         for (int i = 0; i < sCommandNames.length; i++)
         {
             CommandName curCommandName = getComposedCommandByDisplayName(sCommandNames[i]);
+            if (curCommandName == null) {
+                throw new SQLException("Error: CommandName unavailable");
+            }
             sFromClause.append(" ").append(curCommandName.getComposedName()).append(" ").append(quoteName(curCommandName.getAliasName()));
             if (i < sCommandNames.length - 1)
             {