Merge branch 'release/1.0.1' into v1

nystudio107 · Sep 22, 2018 · 2a4f931 · 2a4f931
2 parents 3d8776b + 8e1db51
commit 2a4f931
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/helpers/Manifest.php b/src/helpers/Manifest.php
@@ -163,14 +163,18 @@ public static function getModule(array $config, string $moduleName, string $type
                     // Try again, but not with home module replacement
                     $isHot = false;
                 } else {
-                    // We couldn't find a manifest; throw an error
-                    throw new NotFoundHttpException(
-                        Craft::t(
-                            'twigpack',
-                            'Manifest file not found at: {manifestPath}',
-                            ['manifestPath' => $manifestPath]
-                        )
-                    );
+                    if ($devMode) {
+                        // We couldn't find a manifest; throw an error
+                        throw new NotFoundHttpException(
+                            Craft::t(
+                                'twigpack',
+                                'Manifest file not found at: {manifestPath}',
+                                ['manifestPath' => $manifestPath]
+                            )
+                        );
+                    }
+
+                    return null;
                 }
             }
         }