diff --git a/src/qqq/utils/qqq/TableUtils.ts b/src/qqq/utils/qqq/TableUtils.ts
index b1b08f3..de484ed 100644
--- a/src/qqq/utils/qqq/TableUtils.ts
+++ b/src/qqq/utils/qqq/TableUtils.ts
@@ -93,6 +93,11 @@ class TableUtils
     *******************************************************************************/
    public static getFieldAndTable(tableMetaData: QTableMetaData, fieldName: string): [QFieldMetaData, QTableMetaData]
    {
+      if(fieldName == null || tableMetaData == null)
+      {
+         return ([null, null]);
+      }
+
       if (fieldName.indexOf(".") > -1)
       {
          const nameParts = fieldName.split(".", 2);
@@ -110,7 +115,7 @@ class TableUtils
          return ([tableMetaData.fields.get(fieldName), tableMetaData]);
       }
 
-      return (null);
+      return ([null, null]);
    }