diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php
index ca779cf78d60be05441c52a1b550a17093f73c49..924853df6bc0c75cb219ec88afb42317c33d4f1d 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nCollectPhrasesCommandTest.php
@@ -61,6 +61,10 @@ class I18nCollectPhrasesCommandTest extends \PHPUnit_Framework_TestCase
         unlink($outputPath);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Specified path doesn't exist
+     */
     public function testExecuteNonExistingPath()
     {
         $this->tester->execute(
@@ -68,7 +72,5 @@ class I18nCollectPhrasesCommandTest extends \PHPUnit_Framework_TestCase
                 'directory' => BP . '/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/non_exist',
             ]
         );
-
-        $this->assertEquals("Specified path doesn't exist" . PHP_EOL, $this->tester->getDisplay());
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
index 63ce240d56acc1d642f7b6576f758e25ff58649d..afb277dab8062d09326f3f6a0f911eb91162a761 100644
--- a/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/I18nCollectPhrasesCommand.php
@@ -35,18 +35,19 @@ class I18nCollectPhrasesCommand extends Command
         $this->setName('i18n:collect-phrases')
             ->setDescription('Discovers phrases in the codebase');
         $this->setDefinition([
-            new InputArgument(self::INPUT_KEY_DIRECTORY, InputArgument::REQUIRED, 'Path to a directory to parse'),
+            new InputArgument(self::INPUT_KEY_DIRECTORY, InputArgument::REQUIRED, 'Directory path to parse'),
             new InputOption(
                 self::INPUT_KEY_OUTPUT,
                 self::SHORTCUT_KEY_OUTPUT,
                 InputOption::VALUE_REQUIRED,
-                'Path (with filename) to output file, by default output the results into standard output stream'
+                'Path (including filename) to an output file. With no file specified, defaults to stdout.'
             ),
             new InputOption(
                 self::INPUT_KEY_MAGENTO,
                 self::SHORTCUT_KEY_MAGENTO,
                 InputOption::VALUE_NONE,
-                'Flag indicates whether the specified "directory" path is a Magento root directory, false by default'
+                'Use the --magento parameter to specify the directory is the Magento root directory.' .
+                ' Omit the parameter if the directory is not the Magento root directory.'
             ),
         ]);
     }
@@ -56,16 +57,12 @@ class I18nCollectPhrasesCommand extends Command
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        try {
-            $generator = ServiceLocator::getDictionaryGenerator();
-            $generator->generate(
-                $input->getArgument(self::INPUT_KEY_DIRECTORY),
-                $input->getOption(self::INPUT_KEY_OUTPUT),
-                $input->getOption(self::INPUT_KEY_MAGENTO)
-            );
-            $output->writeln('Dictionary successfully processed.');
-        } catch (\Exception $e) {
-            $output->writeln($e->getMessage());
-        }
+        $generator = ServiceLocator::getDictionaryGenerator();
+        $generator->generate(
+            $input->getArgument(self::INPUT_KEY_DIRECTORY),
+            $input->getOption(self::INPUT_KEY_OUTPUT),
+            $input->getOption(self::INPUT_KEY_MAGENTO)
+        );
+        $output->writeln('<info>Dictionary successfully processed.</info>');
     }
 }