diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 88caea3c8381359ca42d77f0ea3666f23964463a..da6d60b14ed9bff46b34410eba6c2c0bb4136926 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -68,7 +68,7 @@ class Generator
      * Generate Class
      *
      * @param string $className
-     * @return string
+     * @return string | void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \InvalidArgumentException
      */
@@ -108,8 +108,8 @@ class Generator
                 );
             }
             $this->includeFile($file);
+            return self::GENERATION_SUCCESS;
         }
-        return self::GENERATION_SUCCESS;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
index 871c056d294db7091e46489b3a2f3dadf6ebbd86..a2f270cf278431ae1526be2447418dd9014e3a9b 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
@@ -349,6 +349,6 @@ class DiCompileMultiTenantCommand extends Command
         if (!file_exists(dirname($pluginDefFile))) {
             mkdir(dirname($pluginDefFile), 0777, true);
         }
-        file_put_contents($pluginDefFile, $outputContent);            
+        file_put_contents($pluginDefFile, $outputContent);
     }
 }