diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php
index 4ef2fd67b..fc1b4848a 100644
--- a/workflow/engine/methods/processes/processes_Import_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Import_Ajax.php
@@ -27,7 +27,7 @@ use \ProcessMaker\Importer\XmlImporter;
 ini_set("max_execution_time", 0);
 $affectedGroups = array();
 
-if (preg_match("/^(?:pm|pmx)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION))) {
+if (isset($_FILES["PROCESS_FILENAME"]["name"]) && (preg_match("/^(?:pm|pmx)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION)))) {
     $import = new XmlImporter();
     $granularImport = false;
     $objectImport = array();
@@ -138,10 +138,10 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
             $objectsToImport = G::json_decode($_POST['objectsToImport']);
             if ($_POST['generateUid'] === 'generate') {
                 $generateUid = true;
-                $prjUid = $importer->import($opt1, $opt2, $generateUid);
+                $prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport);
             } elseif ($_POST['generateUid'] === 'keep') {
                 $generateUid = false;
-                $prjUid = $importer->import($opt1, $opt2, $generateUid);
+                $prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport);
             } else {
                 $prjUid = $importer->import($opt1, $opt2, null, $objectsToImport);
             }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
index 177fab5fb..46e66ed9f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
@@ -20,7 +20,10 @@ class GranularImporter
     }
 
     /**
-     * Load Objects List Selected
+     * @param $data
+     * @param $aGranular
+     * @return array
+     * @throws \Exception
      */
     public function loadObjectsListSelected($data, $aGranular)
     {