diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php
index 4cb9e094cb..af3704e1a8 100644
--- a/app/Http/Controllers/Import/IndexController.php
+++ b/app/Http/Controllers/Import/IndexController.php
@@ -100,6 +100,7 @@ class IndexController extends Controller
         $config['initial-config-complete'] = false;
         $config['has-file-upload']         = false;
         $config['delimiter']               = "\t" === $config['delimiter'] ? 'tab' : $config['delimiter'];
+        unset($config['stage']);
 
         $result = json_encode($config, JSON_PRETTY_PRINT);
         $name   = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));
diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php
index 722bb1b1f9..9eee6714e5 100644
--- a/app/Repositories/ImportJob/ImportJobRepository.php
+++ b/app/Repositories/ImportJob/ImportJobRepository.php
@@ -225,11 +225,17 @@ class ImportJobRepository implements ImportJobRepositoryInterface
             $configFileObject = new SplFileObject($file->getRealPath());
             $configRaw        = $configFileObject->fread($configFileObject->getSize());
             $configuration    = json_decode($configRaw, true);
-
+            Log::debug(sprintf('Raw configuration is %s', $configRaw));
             if (null !== $configuration && is_array($configuration)) {
                 Log::debug('Found configuration', $configuration);
                 $this->setConfiguration($job, $configuration);
             }
+            if (null === $configuration) {
+                Log::error('Uploaded configuration is NULL');
+            }
+            if (false === $configuration) {
+                Log::error('Uploaded configuration is FALSE');
+            }
         }
 
         return true;
diff --git a/app/Support/Import/Configuration/File/Initial.php b/app/Support/Import/Configuration/File/Initial.php
index c07b56c4a2..615a72e9f0 100644
--- a/app/Support/Import/Configuration/File/Initial.php
+++ b/app/Support/Import/Configuration/File/Initial.php
@@ -113,6 +113,7 @@ class Initial implements ConfigurationInterface
 
         // process config, if present:
         if (isset($data['configuration_file'])) {
+            Log::debug('Will also upload configuration.');
             $this->repository->processConfiguration($this->job, $data['configuration_file']);
         }