diff --git a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
index 45b646c165f202d00efdae6a6c8df2b4c7b6b343..e9fdc86be15955c0fa50840d682f47b6059ab9f5 100644
--- a/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
+++ b/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.ts
@@ -33,7 +33,7 @@ export interface KeybindingLabelOptions {
 export class KeybindingLabel {
 
 	private domNode: HTMLElement;
-	private keybinding: ResolvedKeybinding;
+	private keybinding: ResolvedKeybinding | undefined;
 	private matches: Matches | undefined;
 	private didEverRender: boolean;
 
@@ -47,7 +47,7 @@ export class KeybindingLabel {
 		return this.domNode;
 	}
 
-	set(keybinding: ResolvedKeybinding, matches?: Matches) {
+	set(keybinding: ResolvedKeybinding | undefined, matches?: Matches) {
 		if (this.didEverRender && this.keybinding === keybinding && KeybindingLabel.areSame(this.matches, matches)) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts b/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
index 4a0f500840e89697836b0c95b594558542404e04..b2dffd595a3b85a3b5a6729bb502a9cba36a2bc4 100644
--- a/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/contrib/watermark/electron-browser/watermark.ts
@@ -146,6 +146,9 @@ export class WatermarkContribution implements IWorkbenchContribution {
 
 	private create(): void {
 		const container = this.partService.getContainer(Parts.EDITOR_PART);
+		if (!container) {
+			throw new Error('Could not find container');
+		}
 		container.classList.add('has-watermark');
 
 		this.watermark = $('.watermark');
@@ -176,7 +179,10 @@ export class WatermarkContribution implements IWorkbenchContribution {
 	private destroy(): void {
 		if (this.watermark) {
 			this.watermark.remove();
-			this.partService.getContainer(Parts.EDITOR_PART).classList.remove('has-watermark');
+			const container = this.partService.getContainer(Parts.EDITOR_PART);
+			if (container) {
+				container.classList.remove('has-watermark');
+			}
 			this.dispose();
 		}
 	}