Index: trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NotificationManager.java	(revision 8115)
+++ trunk/src/org/openstreetmap/josm/gui/NotificationManager.java	(revision 8116)
@@ -150,7 +150,9 @@
         public void actionPerformed(ActionEvent e) {
             hideTimer.stop();
-            currentNotificationPanel.setVisible(false);
-            ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
-            currentNotificationPanel = null;
+            if (currentNotificationPanel != null) {
+                currentNotificationPanel.setVisible(false);
+                ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
+                currentNotificationPanel = null;
+            }
             pauseTimer.restart();
         }
@@ -172,6 +174,8 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
-            currentNotificationPanel.repaint();
+            if (currentNotificationPanel != null) {
+                currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
+                currentNotificationPanel.repaint();
+            }
             startHideTimer();
         }