diff --git a/analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/ExceptionAttachmentBuilder.kt b/analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/ExceptionAttachmentBuilder.kt
index ba1c7f1722f..b96d13f9200 100644
--- a/analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/ExceptionAttachmentBuilder.kt
+++ b/analysis/analysis-internal-utils/src/org/jetbrains/kotlin/analysis/utils/errors/ExceptionAttachmentBuilder.kt
@@ -16,10 +16,10 @@ public class ExceptionAttachmentBuilder {
 
     public fun <T> withEntry(name: String, value: T, render: (T & Any) -> String) {
         withEntry(name) {
-            appendLine("Class: ${value?.let { it::class.java.name }}")
+            appendLine("Class: ${value?.let { it::class.java.name } ?: "<null>"}")
             appendLine("Value:")
             withIndent {
-                appendLine(value?.let(render) ?: "null")
+                appendLine(value?.let(render) ?: "<null>")
             }
         }
     }
@@ -28,7 +28,7 @@ public class ExceptionAttachmentBuilder {
         with(printer) {
             appendLine("- $name:")
             withIndent {
-                appendLine(value)
+                appendLine(value ?: "<null>")
             }
             appendLine(separator)
         }