diff --git a/src/main-process/atom-application.js b/src/main-process/atom-application.js
index 11680f3f1..879975cb6 100644
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -657,7 +657,7 @@ class AtomApplication extends EventEmitter {
 
     this.disposable.add(ipcHelpers.on(ipcMain, 'window-command', (event, command, ...args) => {
       const window = BrowserWindow.fromWebContents(event.sender)
-      return window.emit(command, ...args)
+      return window && window.emit(command, ...args)
     }))
 
     this.disposable.add(ipcHelpers.respondTo('window-method', (browserWindow, method, ...args) => {