diff --git a/src/Robo/Tasks/DrushTask.php b/src/Robo/Tasks/DrushTask.php
index <HASH>..<HASH> 100644
--- a/src/Robo/Tasks/DrushTask.php
+++ b/src/Robo/Tasks/DrushTask.php
@@ -249,6 +249,9 @@ class DrushTask extends CommandStack {
       $this->options[$correspondingCommand] = $this->arguments;
       $this->arguments = '';
     }
+    elseif (isset($this->arguments) && !empty($this->arguments)) {
+      throw new TaskException($this, "A drush command must be added to the stack before setting arguments: {$this->arguments}");
+    }
   }
 
   /**
@@ -281,7 +284,7 @@ class DrushTask extends CommandStack {
    * Overriding CommandArguments::option to default option separator to '='.
    */
   public function option($option, $value = NULL, $separator = '=') {
-    $this->traitOption($option, $value, $separator);
+    return $this->traitOption($option, $value, $separator);
   }
 
   /**
Halt task execution when options set before drush command. (#<I>)

* Return $this in override of option method in drush task.



* Halt task execution when options set before drush command.