From 4bbc649bd9fd4270cafb47046554b04f87af126d Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 9 Jan 2017 16:46:59 +0100
Subject: [PATCH] Fixes #17285: error stack is undefined when my extension is
 activated

---
 src/vs/workbench/api/node/extHostExtensionService.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 3b8e97d6165..814e52aae4b 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -303,6 +303,14 @@ export class ExtHostExtensionService extends AbstractExtensionService<ExtHostExt
 				this._loadExtensionContext(extensionDescription)
 			]).then(values => {
 				return ExtHostExtensionService._callActivate(<IExtensionModule>values[0], <IExtensionContext>values[1]);
+			}, (errors: any[]) => {
+				// Avoid failing with an array of errors, fail with a single error
+				if (errors[0]) {
+					return TPromise.wrapError(errors[0]);
+				}
+				if (errors[1]) {
+					return TPromise.wrapError(errors[1]);
+				}
 			});
 		});
 	}