diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
index 3915251adec7..1caac70409a5 100644
--- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -272,12 +272,14 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
   }
 
   private void fireColorChanged(Color color) {
+    if (myExternalListeners == null) return;
     for (ColorPickerListener listener : myExternalListeners) {
       listener.colorChanged(color);
     }
   }
 
   private void fireClosed(@Nullable Color color) {
+    if (myExternalListeners == null) return;
     for (ColorPickerListener listener : myExternalListeners) {
       listener.closed(color);
     }