diff --git a/global-cli/modifiers/snapshot.js b/global-cli/modifiers/snapshot.js
index c530b340..d7a62dad 100644
--- a/global-cli/modifiers/snapshot.js
+++ b/global-cli/modifiers/snapshot.js
@@ -2,7 +2,8 @@ var
 	path = require('path'),
 	exists = require('path-exists').sync,
 	helper = require('./util/config-helper'),
-	SnapshotPlugin = require('./util/SnapshotPlugin');
+	SnapshotPlugin = require('./util/SnapshotPlugin'),
+	IgnorePlugin = require('webpack').IgnorePlugin;
 
 module.exports = function(config, opts) {
 	if(!opts.framework) {
@@ -27,4 +28,14 @@ module.exports = function(config, opts) {
 		// Disabled temporarily until effectiveness is proven
 		// append: (opts.framework ? '\nenact_framework.load();\n' : undefined)
 	}));
+
+	var ssHelperDeps = [
+		'@enact/i18n',
+		'@enact/moonstone'
+	];
+	for(var i=0; i<ssHelperDeps.length; i++) {
+		if(!exists(path.join(process.cwd(), 'node_modules', ssHelperDeps[i]))) {
+			config.plugins.push(new IgnorePlugin(new RegExp(ssHelperDeps[i])));
+		}
+	}
 };
diff --git a/global-cli/modifiers/util/prerendered-startup.txt b/global-cli/modifiers/util/prerendered-startup.txt
index 63b511e2..c393d087 100644
--- a/global-cli/modifiers/util/prerendered-startup.txt
+++ b/global-cli/modifiers/util/prerendered-startup.txt
@@ -1,7 +1,7 @@
 
 		(function() {
 			// Initialize font scaling for resolution independence.
-			var screenTypes = %SCREENTYPES%;
+			var screenTypes = %SCREENTYPES% || [];
 			var defaultType = {name: 'standard', pxPerRem: 16, width: window.innerWidth, height: window.innerHeight, aspectRatioName: 'standard', base: true};
 			if(screenTypes.length===0) {
 				screenTypes.push(defaultType);
diff --git a/global-cli/modifiers/util/snapshot-helper.js b/global-cli/modifiers/util/snapshot-helper.js
index c712c83f..9180c672 100644
--- a/global-cli/modifiers/util/snapshot-helper.js
+++ b/global-cli/modifiers/util/snapshot-helper.js
@@ -5,6 +5,14 @@
  *  launch-time issues when using code created in a snapshot blob.
  */
 
+function handleException(e) {
+	// We allow 'Cannot find module' errors, which throw when the libraries are not used in the app.
+	// @enact/i18n and @enact/moonstone are considered optional dependencies.
+	if(!e.code || e.code!=='MODULE_NOT_FOUND') {
+		throw e;
+	}
+}
+
 global.updateEnvironment = function() {
 	// Update fbjs to have the correct execution environment for the active window.
 	var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
@@ -16,17 +24,27 @@ global.updateEnvironment = function() {
 	ExecutionEnvironment.canUseViewport = canUseDOM && !!window.screen;
 	ExecutionEnvironment.isInWorker = !canUseDOM; // For now, this is true - might change in the future.
 
-	// Mark the iLib localestorage cache as needing re-validation.
-	var ilib = require('@enact/i18n/ilib/lib/ilib');
-	if (ilib._load) {
-		ilib._load._cacheValidated = false;
-	}
+	try {
+		// Mark the iLib localestorage cache as needing re-validation.
+		var ilib = require('@enact/i18n/ilib/lib/ilib');
+		if (ilib && ilib._load) {
+			ilib._load._cacheValidated = false;
+		}
 
-	// Clear the active resBundle and string cache.
-	var resBundle = require('@enact/i18n/src/resBundle');
-	resBundle.clearResBundle();
+		// Clear the active resBundle and string cache.
+		var resBundle = require('@enact/i18n/src/resBundle');
+		resBundle.clearResBundle();
+		try {
+			var moonstoneBundle = require('@enact/moonstone/internal/$L');
+			moonstoneBundle.clearResBundle();
+		} catch(e2) {
+			handleException(e2);
+		}
 
-	// Update the iLib/Enact locale to the active window's locale.
-	var locale = require('@enact/i18n/locale');
-	locale.updateLocale();
+		// Update the iLib/Enact locale to the active window's locale.
+		var locale = require('@enact/i18n/locale');
+		locale.updateLocale();
+	} catch(e1) {
+		handleException(e1);
+	}
 };