diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ExceptionAutoReportUtil.kt b/platform/platform-impl/src/com/intellij/diagnostic/ExceptionAutoReportUtil.kt
index c658f49e8b7d..151488ddddb8 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/ExceptionAutoReportUtil.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/ExceptionAutoReportUtil.kt
@@ -169,7 +169,6 @@ object ExceptionAutoReportUtil {
     val cls = submitter.javaClass
     return cls == ITNReporter::class.java
            || cls.name == $$"com.intellij.rustrover.RustRoverMessagePoolAutoReporter$MyITNReporter"
-           && ApplicationManager.getApplication().isEAP
   }
 
   fun isFreeze(throwable: Throwable): Boolean {
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
index 126529cb1c72..5e106209ae7a 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
@@ -367,7 +367,9 @@ object ITNProxy {
 
       if (errorBean.isAutoReportedByPlatform) {
         append(builder, "report.automatic", "true")
-        append(builder, "report.automatic.source", ExceptionAutoReportUtil.getAutoReportSource(event.throwable))
+        if (event.throwable != null) {
+          append(builder, "report.automatic.source", ExceptionAutoReportUtil.getAutoReportSource(event.throwable))
+        }
 
         ExceptionAutoReportUtil.getAutoReportTag()?.let {
           append(builder, "report.automatic.tag", it)