diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index ee5034c854..17773a4efb 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -40,6 +40,7 @@ Yii Framework 2 Change Log
 - Bug: Fixed issue with tabular input on ActiveField::radio() and ActiveField::checkbox() (jom)
 - Bug: Fixed the issue that query cache returns the same data for the same SQL but different query methods (qiangxue)
 - Bug: Fixed URL parsing so it's now properly giving 404 for URLs like `http://example.com//////site/about` (samdark)
+- Bug: Fixed `HelpController::getModuleCommands` issue where it attempts to scan a module's controller directory when it doesn't exist (jom)
 - Enh #46: Added Image extension based on [Imagine library](http://imagine.readthedocs.org) (tonydspaniard)
 - Enh #364: Improve Inflector::slug with `intl` transliteration. Improved transliteration char map. (tonydspaniard)
 - Enh #797: Added support for validating multiple columns by `UniqueValidator` and `ExistValidator` (qiangxue)
diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
index 49ee2c87be..3f7d221625 100644
--- a/framework/console/controllers/HelpController.php
+++ b/framework/console/controllers/HelpController.php
@@ -123,10 +123,13 @@ class HelpController extends Controller
 			}
 		}
 
-		$files = scandir($module->getControllerPath());
-		foreach ($files as $file) {
-			if (strcmp(substr($file, -14), 'Controller.php') === 0) {
-				$commands[] = $prefix . Inflector::camel2id(substr(basename($file), 0, -14));
+		$controllerPath = $module->getControllerPath();
+		if (is_dir($controllerPath)) {
+			$files = scandir($controllerPath);
+			foreach ($files as $file) {
+				if (strcmp(substr($file, -14), 'Controller.php') === 0) {
+					$commands[] = $prefix . Inflector::camel2id(substr(basename($file), 0, -14));
+				}
 			}
 		}