From 2fb8c4b642bae77e0a515512450129503db5aa38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 1 Mar 2016 10:53:35 +0000
Subject: [PATCH] coverity#1326385 Dereference null return value

Change-Id: I0097e9759c1ac3a1e03d9c2741c109e147dce540
---
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
             {