diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java
index 5185cf374268..ed0ba953aae1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.SourcePosition;
@@ -94,8 +94,9 @@ public abstract class JvmSmartStepIntoHandler {
   private static void highlightTarget(PsiMethodListPopupStep popupStep, SmartStepTarget target, SourcePosition position) {
     final PsiElement highlightElement = target.getHighlightElement();
     if (highlightElement != null) {
-      LOG.assertTrue(PsiTreeUtil.isAncestor(position.getFile(), highlightElement, false),
-                     "Highlight element " + highlightElement + " in " + target + " is not from the current file");
+      if (!PsiTreeUtil.isAncestor(position.getFile(), highlightElement, false)) {
+        LOG.error("Highlight element " + highlightElement + " in " + target + " is not from the current file", target.myCreationStack);
+      }
       popupStep.getScopeHighlighter().highlight(highlightElement, Collections.singletonList(highlightElement));
     }
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/SmartStepTarget.java b/java/debugger/impl/src/com/intellij/debugger/actions/SmartStepTarget.java
index 3298da37824f..995b0b1d7646 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/SmartStepTarget.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/SmartStepTarget.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.debugger.actions;
 
 import com.intellij.openapi.util.text.StringUtil;
@@ -31,6 +17,7 @@ public abstract class SmartStepTarget {
   private final String myLabel;
   private final boolean myNeedBreakpointRequest;
   private Range<Integer> myExpressionLines;
+  final Throwable myCreationStack = new Throwable();
 
   protected SmartStepTarget(@Nullable String label, @Nullable PsiElement highlightElement, boolean needBreakpointRequest, Range<Integer> expressionLines) {
     myHighlightElement = highlightElement;