diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 5d7a654ab3d..6bc213d46ac 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -603,7 +603,7 @@
     <debugger.sourcePositionProvider implementation="org.jetbrains.kotlin.idea.debugger.KotlinSourcePositionProvider"/>
     <debugger.sourcePositionHighlighter implementation="org.jetbrains.kotlin.idea.debugger.KotlinSourcePositionHighlighter"/>
     <debugger.frameExtraVarsProvider implementation="org.jetbrains.kotlin.idea.debugger.KotlinFrameExtraVariablesProvider"/>
-    <debugger.extraSteppingFilter implementation="org.jetbrains.kotlin.idea.ExtraSteppingFilter"/>
+    <debugger.extraSteppingFilter implementation="org.jetbrains.kotlin.idea.KotlinExtraSteppingFilter"/>
     <xdebugger.settings implementation="org.jetbrains.kotlin.idea.debugger.KotlinDebuggerSettings"/>
     <xdebugger.breakpointType implementation="org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpointType"/>
     <xdebugger.breakpointType implementation="org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinLineBreakpointType" order="first"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt
similarity index 94%
rename from idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
rename to idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt
index 8f10ee038ae..f84cef8ae96 100644
--- a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea
 
 import com.intellij.debugger.NoDataException
+import com.intellij.debugger.engine.ExtraSteppingFilter
 import com.intellij.debugger.engine.SuspendContext
 import com.intellij.debugger.settings.DebuggerSettings
 import com.sun.jdi.Location
@@ -24,8 +25,7 @@ import com.sun.jdi.request.StepRequest
 import org.jetbrains.kotlin.idea.debugger.KotlinPositionManager
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 
-class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
-
+class KotlinExtraSteppingFilter : ExtraSteppingFilter {
     override fun isApplicable(context: SuspendContext?): Boolean {
         if (context == null) {
             return false
@@ -52,9 +52,7 @@ class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
                 }
                 catch(e: NoDataException) {
                     return false
-                }
-
-        if (sourcePosition == null) return false
+                } ?: return false
 
         val settings = DebuggerSettings.getInstance()
         if (settings.TRACING_FILTERS_ENABLED) {