diff --git a/lib/common/mobile/mobile-core/devices-service.ts b/lib/common/mobile/mobile-core/devices-service.ts
index 0670b21d40..073aa73a1d 100644
--- a/lib/common/mobile/mobile-core/devices-service.ts
+++ b/lib/common/mobile/mobile-core/devices-service.ts
@@ -128,9 +128,6 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		const availableEmulatorsOutput = await this.getEmulatorImages({ platform: options.platform });
 		const emulators = this.$emulatorHelper.getEmulatorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
 		const errors = this.$emulatorHelper.getErrorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
-		if (errors.length) {
-			return errors;
-		}
 
 		let emulator = null;
 		if (options.imageIdentifier) {
@@ -140,7 +137,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		}
 
 		if (!emulator) {
-			return [`Unable to find emulator with provided options: ${options}`];
+			const additionalErrors = errors && errors.length ? errors : [];
+			return [`Unable to find emulator with provided options: ${options}`, ...additionalErrors];
 		}
 
 		// emulator is already running
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d69765b45d..3ed51824b8 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -3938,9 +3938,9 @@
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "ios-device-lib": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/ios-device-lib/-/ios-device-lib-0.5.1.tgz",
-      "integrity": "sha512-HW96QpgGCCtg5E8rz+758FrieUbwqHFC7c2g6Al2kTIF2iaKBeVXZhONE8PoQPtpm+PrFBBkA9i4ZlyntS2FoA==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/ios-device-lib/-/ios-device-lib-0.5.2.tgz",
+      "integrity": "sha512-OSUcEkyS5AnoLs9g+oONIyPUOFHJNaSR93aep9QeLN6xkaY+fNqfUIIj45AQZDaFUpDcWiqiWr7gMOImqNcoYQ==",
       "requires": {
         "bufferpack": "0.0.6",
         "node-uuid": "1.4.7"
diff --git a/package.json b/package.json
index e82755fd80..2a83812c1b 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "esprima": "2.7.0",
     "iconv-lite": "0.4.11",
     "inquirer": "6.2.0",
-    "ios-device-lib": "0.5.1",
+    "ios-device-lib": "0.5.2",
     "ios-mobileprovision-finder": "1.0.10",
     "ios-sim-portable": "4.0.9",
     "istextorbinary": "2.2.1",
diff --git a/resources/test/karma.conf.js b/resources/test/karma.conf.js
index 705b5a713e..e646ebb976 100644
--- a/resources/test/karma.conf.js
+++ b/resources/test/karma.conf.js
@@ -102,5 +102,7 @@ function setWebpack(config, options) {
     options.webpack = require('./webpack.config')(env);
     delete options.webpack.entry;
     delete options.webpack.output.libraryTarget;
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
   }
 }