diff --git a/src/workflow/ArcanistShellCompleteWorkflow.php b/src/workflow/ArcanistShellCompleteWorkflow.php
index 0a933506..6e6c8319 100644
--- a/src/workflow/ArcanistShellCompleteWorkflow.php
+++ b/src/workflow/ArcanistShellCompleteWorkflow.php
@@ -84,6 +84,9 @@ EOTEXT
           continue;
         }
 
+        $workflow->setArcanistConfiguration($this->getArcanistConfiguration());
+        $workflow->setConfigurationManager($this->getConfigurationManager());
+
         if ($vcs || $workflow->requiresWorkingCopy()) {
           $supported_vcs = $workflow->getSupportedRevisionControlSystems();
           if (!in_array($vcs, $supported_vcs)) {
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
index 5689b7ab..ca47c8ca 100644
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -53,8 +53,8 @@ abstract class ArcanistWorkflow extends Phobject {
   private $repositoryAPI;
   private $configurationManager;
   private $workingCopy;
-  private $arguments;
-  private $passedArguments;
+  private $arguments = array();
+  private $passedArguments = array();
   private $command;
 
   private $stashed;