diff --git a/plugins/git4idea/src/git4idea/index/ui/GitStageTree.kt b/plugins/git4idea/src/git4idea/index/ui/GitStageTree.kt
index a4f465a76394..f7505b9c3e9b 100644
--- a/plugins/git4idea/src/git4idea/index/ui/GitStageTree.kt
+++ b/plugins/git4idea/src/git4idea/index/ui/GitStageTree.kt
@@ -125,8 +125,8 @@ abstract class GitStageTree(project: Project) : ChangesTree(project, false, true
 
     private fun getMovedRelativePath(userObject: GitFileStatusNode): String? {
       val origPath = userObject.origPath
-      if (origPath == null || origPath!!.parentPath == userObject.filePath.parentPath) return null
-      return PlatformVcsPathPresenter.getPresentableRelativePath(userObject.filePath, origPath!!)
+      if (origPath == null || origPath.parentPath == userObject.filePath.parentPath) return null
+      return PlatformVcsPathPresenter.getPresentableRelativePath(userObject.filePath, origPath)
     }
   }