diff --git a/platform/platform-api/src/com/intellij/util/ui/LafIconLookup.kt b/platform/platform-api/src/com/intellij/util/ui/LafIconLookup.kt
index a267b624f42c..bffe906f76b2 100644
--- a/platform/platform-api/src/com/intellij/util/ui/LafIconLookup.kt
+++ b/platform/platform-api/src/com/intellij/util/ui/LafIconLookup.kt
@@ -12,6 +12,11 @@ object LafIconLookup {
   @JvmStatic
   @JvmOverloads
   fun getIcon(name: String, selected: Boolean = false, focused: Boolean = false, enabled: Boolean = true, editable: Boolean = false, pressed: Boolean = false): Icon {
+    return findIcon(name, selected = selected, focused = focused, enabled = enabled, editable = editable, pressed = pressed, isThrowErrorIfNotFound = true)
+           ?: AllIcons.Actions.Stub
+  }
+
+  fun findIcon(name: String, selected: Boolean = false, focused: Boolean = false, enabled: Boolean = true, editable: Boolean = false, pressed: Boolean = false, isThrowErrorIfNotFound: Boolean = false): Icon? {
     var key = name
     if (editable) key += "Editable"
     if (selected) key += "Selected"
@@ -32,8 +37,7 @@ object LafIconLookup {
     }
 
     key = dir + key
-
-    return IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/$key.png", LafIconLookup::class.java, true) ?: AllIcons.Actions.Stub
+    return IconLoader.findIcon("/com/intellij/ide/ui/laf/icons/$key.png", LafIconLookup::class.java, true, isThrowErrorIfNotFound)
   }
 
   @JvmStatic
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt
index 13d495627360..9bcc75b659e9 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ui/SvgRenderer.kt
@@ -58,15 +58,15 @@ internal class SvgRenderer(val svgFileDir: Path, private val deviceConfiguration
         for (name in arrayOf("checkBox", "radio", "gear", "spinnerRight")) {
           val iconWrapper = when (name) {
             "gear" -> IconLoader.getIcon("/general/gear.png")
-            else -> LafIconLookup.getIcon(name)
-          }
+            else -> LafIconLookup.findIcon(name)
+          } ?: continue
 
           if (isImage(iconWrapper)) {
             return getIconRelativePath(iconWrapper.toString())
           }
         }
         for (name in arrayOf("checkBox", "radio")) {
-          val iconWrapper = LafIconLookup.getIcon(name, selected = true)
+          val iconWrapper = LafIconLookup.findIcon(name, selected = true) ?: continue
           if (isImage(iconWrapper)) {
             return getIconRelativePath(iconWrapper.toString())
           }