diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index 73128d423..12de433a2 100755
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -23,9 +23,14 @@ $conf = new Configurations();
 try {
     // the setup for search is the same as the Sent (participated)
     $confCasesList = $conf->getConfiguration( 'casesList', ($action == 'search' || $action == 'simple_search') ? 'search' : $action );
-    $aditionalTable = new AdditionalTables();
-    $table = $aditionalTable->load($confCasesList['PMTable']);
+
+    $table = null;
+    if (isset($confCasesList['PMTable'])) {
+        $aditionalTable = new AdditionalTables();
+        $table = $aditionalTable->load($confCasesList['PMTable']);
+    }
     $confCasesList = ($table != null) ? $confCasesList : array ();
+
     $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
 } catch (Exception $e) {
     $confCasesList = array ();
@@ -372,7 +377,7 @@ function getAdditionalFields($action, $confCasesList = array())
     $config = new Configurations();
     $arrayConfig = $config->casesListDefaultFieldsAndConfig($action);
 
-    if (is_array($confCasesList) && count($confCasesList) > 0 && count($confCasesList["second"]["data"]) > 0) {
+    if (is_array($confCasesList) && count($confCasesList) > 0 && isset($confCasesList["second"]) && count($confCasesList["second"]["data"]) > 0) {
         //For the case list builder in the enterprise plugin
         $caseColumns = array();
         $caseReaderFields = array();
diff --git a/workflow/engine/templates/cases/casesListSetup.js b/workflow/engine/templates/cases/casesListSetup.js
index b9f2b8631..0c322203a 100644
--- a/workflow/engine/templates/cases/casesListSetup.js
+++ b/workflow/engine/templates/cases/casesListSetup.js
@@ -27,6 +27,12 @@ Ext.onReady(function () {
             case "FIELD_SAVE":
 
                 var rs = firstGrid.store.data.items;
+                if (pmTablesDropdown.getValue() == '') {
+                    if (rs.length != 0) {
+                        Ext.Msg.alert(_("ID_INFO"), _("ID_EMPTY_PMTABLE"));
+                        return;
+                    }
+                }
                 var fv = [];
 
                 for (i = 0; i <= rs.length - 1; i++) {