From 500d192063f8bacb0e0189bab3daed6ebf84de71 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 25 Sep 2017 16:37:25 +0300
Subject: [PATCH] Remove null assert (EA-107777)

---
 .../kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt
index 51381286e07..3f54101b467 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt
@@ -65,8 +65,8 @@ private fun findAdditionalExpressions(position: SourcePosition): Set<TextWithImp
 
     val offset = file.getLineStartOffset(line)?.takeIf { it > 0 } ?: return emptySet()
 
-    val elem = file.findElementAt(offset)
-    val containingElement = getContainingElement(elem!!) ?: elem ?: return emptySet()
+    val elem = file.findElementAt(offset) ?: return emptySet()
+    val containingElement = getContainingElement(elem) ?: elem
 
     val limit = getLineRangeForElement(containingElement, doc)