diff --git a/src/main.js b/src/main.js
index 162a949f7d5..703cdfd5c0b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,8 @@ perf.mark('main:started');
 // Perf measurements
 global.perfStartTime = Date.now();
 
+Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
+
 //#region Add support for using node_modules.asar
 (function () {
 	const path = require('path');
@@ -366,7 +368,7 @@ function getNLSConfiguration(locale) {
 								}
 								target[module] = targetStrings;
 							}
-							writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g,'!') + '.nls.json'), JSON.stringify(target)));
+							writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g, '!') + '.nls.json'), JSON.stringify(target)));
 						}
 						writes.push(writeFile(translationsConfigFile, JSON.stringify(packConfig.translations)));
 						return Promise.all(writes);
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 214c9712808..3f692a0f8d7 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -878,7 +878,9 @@ export class CodeWindow implements ICodeWindow {
 	}
 
 	public send(channel: string, ...args: any[]): void {
-		this._win.webContents.send(channel, ...args);
+		if (this._win) {
+			this._win.webContents.send(channel, ...args);
+		}
 	}
 
 	public updateTouchBar(groups: ICommandAction[][]): void {