diff --git a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
index d9ffb12ec10..c03c6624380 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
@@ -29,7 +29,7 @@ public fun <T> Collection<T>?.concat(collection: Collection<T>): Collection<T>?
     if (this == null) {
         return collection
     }
-    if (this is LinkedHashSet<*>) {
+    if (this is LinkedHashSet) {
         addAll(collection)
         return this
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
index 59068fdb750..6e289d711fe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
@@ -282,7 +282,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
                         override fun computeHashCode(e: PsiElement?): Int {
                             return when (e) {
                                 null -> 0
-                                is KtLightElement<*, *> -> e.getOrigin().hashCode() * 31 + (e.name?.hashCode() ?: 0)
+                                is KtLightElement<*, *> -> (e.getOrigin()?.hashCode() ?: 0) * 31 + (e.name?.hashCode() ?: 0)
                                 else -> e.hashCode()
                             }
                         }