modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java

@@ -355,10 +355,13 @@
         if (lastTkPulseListener != null) {
             runPulse(lastTkPulseListener, lastTkPulseAcc);
         }
     }
     public void addStageTkPulseListener(TKPulseListener listener) {
+        if (listener == null) {
+            return;
+        }
         synchronized (this) {
             AccessControlContext acc = AccessController.getContext();
             stagePulseListeners.put(listener, acc);
         }
     }

@@ -366,10 +369,13 @@
         synchronized (this) {
             stagePulseListeners.remove(listener);
         }
     }
     public void addSceneTkPulseListener(TKPulseListener listener) {
+        if (listener == null) {
+            return;
+        }
         synchronized (this) {
             AccessControlContext acc = AccessController.getContext();
             scenePulseListeners.put(listener, acc);
         }
     }

@@ -377,10 +383,13 @@
         synchronized (this) {
             scenePulseListeners.remove(listener);
         }
     }
     public void addPostSceneTkPulseListener(TKPulseListener listener) {
+        if (listener == null) {
+            return;
+        }
         synchronized (this) {
             AccessControlContext acc = AccessController.getContext();
             postScenePulseListeners.put(listener, acc);
         }
     }

@@ -389,10 +398,13 @@
             postScenePulseListeners.remove(listener);
         }
     }
 
     public void addTkListener(TKListener listener) {
+        if (listener == null) {
+            return;
+        }
         AccessControlContext acc = AccessController.getContext();
         toolkitListeners.put(listener, acc);
     }
 
     public void removeTkListener(TKListener listener) {

@@ -405,10 +417,13 @@
         lastTkPulseAcc = AccessController.getContext();
         lastTkPulseListener = listener;
     }
 
     public void addShutdownHook(Runnable hook) {
+        if (hook == null) {
+            return;
+        }
         synchronized (shutdownHooks) {
             shutdownHooks.add(hook);
         }
     }