diff --git a/platform/util/src/com/intellij/ui/ColorUtil.java b/platform/util/src/com/intellij/ui/ColorUtil.java
index ecb7418d5dda..21246ea4bfee 100644
--- a/platform/util/src/com/intellij/ui/ColorUtil.java
+++ b/platform/util/src/com/intellij/ui/ColorUtil.java
@@ -204,7 +204,8 @@ public class ColorUtil {
   }
 
   @Nullable
-  public static Color fromHex(@NotNull String str, @Nullable Color defaultValue) {
+  public static Color fromHex(@Nullable String str, @Nullable Color defaultValue) {
+    if (str == null) return defaultValue;
     try {
       return fromHex(str);
     }