diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts
index 679657568493607cc00daa2f5dbfe1df8c078ec5..a54c1b7758d5afeb4cf7f1098b8411ca0d093aff 100644
--- a/src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalActions.ts
@@ -137,7 +137,7 @@ export class QuickKillTerminalAction extends Action {
 		if (instance) {
 			instance.dispose(true);
 		}
-		return Promise.resolve(timeout(50)).then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
+		return Promise.resolve(timeout(50)).then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined));
 	}
 }
 
@@ -291,7 +291,7 @@ export class SendSequenceTerminalCommand extends Command {
 		const workspaceContextService = accessor.get(IWorkspaceContextService);
 		const historyService = accessor.get(IHistoryService);
 		const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
-		const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) : null;
+		const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri) || undefined : undefined;
 		const resolvedText = configurationResolverService.resolve(lastActiveWorkspaceRoot, args.text);
 		terminalInstance.sendText(resolvedText, false);
 	}
@@ -324,7 +324,7 @@ export class CreateNewTerminalAction extends Action {
 			}
 		}
 
-		let instancePromise: Promise<ITerminalInstance>;
+		let instancePromise: Promise<ITerminalInstance | null>;
 		if (folders.length <= 1) {
 			// Allow terminal service to handle the path when there is only a
 			// single root
@@ -651,7 +651,7 @@ export class RunSelectedTextInTerminalAction extends Action {
 			return Promise.resolve(undefined);
 		}
 		let editor = this.codeEditorService.getFocusedCodeEditor();
-		if (!editor) {
+		if (!editor || !editor.hasModel()) {
 			return Promise.resolve(undefined);
 		}
 		let selection = editor.getSelection();
@@ -687,7 +687,7 @@ export class RunActiveFileInTerminalAction extends Action {
 			return Promise.resolve(undefined);
 		}
 		const editor = this.codeEditorService.getActiveCodeEditor();
-		if (!editor) {
+		if (!editor || !editor.hasModel()) {
 			return Promise.resolve(undefined);
 		}
 		const uri = editor.getModel().uri;
@@ -1050,7 +1050,7 @@ export class QuickOpenTermAction extends Action {
 	}
 
 	public run(): Promise<void> {
-		return this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null);
+		return this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined);
 	}
 }
 
@@ -1071,7 +1071,7 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction {
 		super.run(this.terminal)
 			// This timeout is needed to make sure the previous quickOpen has time to close before we show the next one
 			.then(() => timeout(50))
-			.then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, null));
+			.then(result => this.quickOpenService.show(TERMINAL_PICKER_PREFIX, undefined));
 		return Promise.resolve(null);
 	}
 }