1 files changed, 3 insertions, 1 deletions

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 01a1695f385..c008300dd3a 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -304,7 +304,9 @@ public class EmacsService extends Service
     array = new short[windowList.size () + 1];
     i = 1;
 
-    array[0] = window.parent != null ? 0 : window.parent.handle;
+    array[0] = (window == null
+                ? 0 : (window.parent != null
+                       ? window.parent.handle : 0));
 
     for (EmacsWindow treeWindow : windowList)
       array[i++] = treeWindow.handle;