diff --git a/package.json b/package.json
index 03ee6ff7f..b0d59a501 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.14.4",
+  "version": "3.14.5",
   "main": "lib/public/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 67728cfbd..87a03bd2b 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -832,7 +832,9 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
    */
   private _setTheme(theme: ITheme): void {
     this._theme = theme;
-    this._colorManager.setTheme(theme);
+    if (this._colorManager) {
+      this._colorManager.setTheme(theme);
+    }
     if (this._renderCoordinator) {
       this._renderCoordinator.setColors(this._colorManager.colors);
     }
diff --git a/src/WindowsMode.ts b/src/WindowsMode.ts
index d7b4bcaec..9afde6ff7 100644
--- a/src/WindowsMode.ts
+++ b/src/WindowsMode.ts
@@ -22,9 +22,7 @@ export function applyWindowsMode(terminal: ITerminal): IDisposable {
     const line = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y - 1);
     const lastChar = line.get(terminal.cols - 1);
 
-    if (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE) {
-      const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y);
-      nextLine.isWrapped = true;
-    }
+    const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y);
+    nextLine.isWrapped = (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE);
   });
 }