diff --git a/src/Composer/Command/Command.php b/src/Composer/Command/Command.php
index 227ee0479..271cdbc65 100644
--- a/src/Composer/Command/Command.php
+++ b/src/Composer/Command/Command.php
@@ -46,7 +46,12 @@ abstract class Command extends BaseCommand
             $application = $this->getApplication();
             if ($application instanceof Application) {
                 /* @var $application    Application */
-                $this->composer = $application->getComposer();
+                $this->composer = $application->getComposer($required);
+            } elseif ($required) {
+                throw new \RuntimeException(
+                    'Could not create a Composer\Composer instance, you must inject '.
+                    'one if this command is not used with a Composer\Console\Application instance'
+                );
             }
         }
 
diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php
index 61e0b0f7a..e2e9dfc39 100644
--- a/src/Composer/Composer.php
+++ b/src/Composer/Composer.php
@@ -130,7 +130,7 @@ class Composer
     }
 
     /**
-     * @return  Doenloader\DownloadManager
+     * @return  Downloader\DownloadManager
      */
     public function getDownloadManager()
     {
diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
index ea9712e41..8dc58b8ce 100644
--- a/src/Composer/Console/Application.php
+++ b/src/Composer/Console/Application.php
@@ -41,7 +41,7 @@ class Application extends BaseApplication
     protected $composer;
 
     /**
-     * @var ConsoleIO
+     * @var IOInterface
      */
     protected $io;