diff --git a/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/PyStatementMover.java b/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/PyStatementMover.java
index d24a294d549f..b3264a65f361 100644
--- a/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/PyStatementMover.java
+++ b/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/PyStatementMover.java
@@ -501,7 +501,7 @@ public class PyStatementMover extends LineMover {
       }
     }
     else {
-      if (startElement != endElement) {
+      if (startElement != endElement && nextSibling != null) {
         scope.addRangeAfter(nextSibling, endElement, anchor);
       }
       addedElement = scope.addAfter(startElement, anchor);