MAGETWO-68928: Fatal error after disabling module

Author: shiftedreality

lib/internal/Magento/Framework/Console/Cli.php

@@ -79,22 +79,22 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
             $this->assertCompilerPreparation();
             $this->initObjectManager();
             $this->assertGenerationPermissions();
-
-            if ($version == 'UNKNOWN') {
-                $directoryList = new DirectoryList(BP);
-                $composerJsonFinder = new ComposerJsonFinder($directoryList);
-                $productMetadata = new ProductMetadata($composerJsonFinder);
-                $version = $productMetadata->getVersion();
-            }
         } catch (\Exception $exception) {
-            $output = new Console\Output\ConsoleOutput();
+            $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln(
                 '<error>' . $exception->getMessage() . '</error>'
             );
 
             exit(static::RETURN_FAILURE);
         }
 
+        if ($version == 'UNKNOWN') {
+            $directoryList = new DirectoryList(BP);
+            $composerJsonFinder = new ComposerJsonFinder($directoryList);
+            $productMetadata = new ProductMetadata($composerJsonFinder);
+            $version = $productMetadata->getVersion();
+        }
+
         parent::__construct($name, $version);
     }
 

lib/internal/Magento/Framework/Console/Test/Unit/Exception/GenerationDirectoryAccessExceptionTest.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Console\Test\Unit\Exception;
+
+use Magento\Framework\Console\Exception\GenerationDirectoryAccessException;
+
+class GenerationDirectoryAccessExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstructor()
+    {
+        $exception = new GenerationDirectoryAccessException();
+
+        $this->assertContains(
+            'Command line user does not have read and write permissions on generated directory.',
+            $exception->getMessage()
+        );
+    }
+}