diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee
index 3c4844a9c..886f31f7f 100644
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -294,7 +294,7 @@ class AtomApplication
       win.emit(command, args...)
 
     @disposable.add ipcHelpers.respondTo 'window-method', (browserWindow, method, args...) =>
-      @atomWindowForBrowserWindow(browserWindow)[method](args...)
+      @atomWindowForBrowserWindow(browserWindow)?[method](args...)
 
     @disposable.add ipcHelpers.on ipcMain, 'pick-folder', (event, responseChannel) =>
       @promptForPath "folder", (selectedPaths) ->