diff --git a/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/GroupSurrounder.java b/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/GroupSurrounder.java
index 7461b9f46ff2..7ab853c1f97e 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/GroupSurrounder.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/surroundWith/GroupSurrounder.java
@@ -28,7 +28,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.IncorrectOperationException;
 import org.intellij.lang.regexp.RegExpFileType;
 import org.intellij.lang.regexp.psi.RegExpAtom;
 import org.intellij.lang.regexp.psi.RegExpPattern;
@@ -57,7 +56,7 @@ class GroupSurrounder implements Surrounder {
 
     @Override
     @Nullable
-    public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) throws IncorrectOperationException {
+    public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
         assert elements.length == 1 || PsiTreeUtil.findCommonParent(elements) == elements[0].getParent();
         final PsiElement e = elements[0];
         final ASTNode node = e.getNode();
diff --git a/java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java b/java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
index 2b2c00a3605b..3aa45cf2bafa 100644
--- a/java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
+++ b/java/openapi/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java
@@ -35,7 +35,7 @@ public abstract class JavaExpressionSurrounder implements Surrounder {
   @Override
   public TextRange surroundElements(@NotNull Project project,
                                     @NotNull Editor editor,
-                                    PsiElement @NotNull [] elements) throws IncorrectOperationException {
+                                    PsiElement @NotNull [] elements) {
     if (elements.length != 1 || !(elements[0] instanceof PsiExpression)) {
       throw new IllegalArgumentException(Arrays.toString(elements));
     }
diff --git a/json/src/com/intellij/json/surroundWith/JsonSurrounderBase.java b/json/src/com/intellij/json/surroundWith/JsonSurrounderBase.java
index 0ae524087fc9..62d114b545f5 100644
--- a/json/src/com/intellij/json/surroundWith/JsonSurrounderBase.java
+++ b/json/src/com/intellij/json/surroundWith/JsonSurrounderBase.java
@@ -9,7 +9,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -20,8 +19,7 @@ public abstract class JsonSurrounderBase implements Surrounder {
   }
 
   @Override
-  public @Nullable TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements)
-    throws IncorrectOperationException {
+  public @Nullable TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     if (!isApplicable(elements)) {
       return null;
     }
diff --git a/json/src/com/intellij/json/surroundWith/JsonWithObjectLiteralSurrounder.java b/json/src/com/intellij/json/surroundWith/JsonWithObjectLiteralSurrounder.java
index 0f1a8dce21e1..0ffc5325e0d2 100644
--- a/json/src/com/intellij/json/surroundWith/JsonWithObjectLiteralSurrounder.java
+++ b/json/src/com/intellij/json/surroundWith/JsonWithObjectLiteralSurrounder.java
@@ -7,7 +7,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,7 +48,7 @@ public final class JsonWithObjectLiteralSurrounder extends JsonSurrounderBase {
   @Override
   public @Nullable TextRange surroundElements(@NotNull Project project,
                                               @NotNull Editor editor,
-                                              PsiElement @NotNull [] elements) throws IncorrectOperationException {
+                                              PsiElement @NotNull [] elements) {
 
     if (!isApplicable(elements)) {
       return null;
diff --git a/platform/lang-api/src/com/intellij/lang/surroundWith/ModCommandSurrounder.java b/platform/lang-api/src/com/intellij/lang/surroundWith/ModCommandSurrounder.java
index 38c5e4421eb4..8c24ce297010 100644
--- a/platform/lang-api/src/com/intellij/lang/surroundWith/ModCommandSurrounder.java
+++ b/platform/lang-api/src/com/intellij/lang/surroundWith/ModCommandSurrounder.java
@@ -13,7 +13,6 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -40,8 +39,7 @@ public abstract class ModCommandSurrounder implements Surrounder {
   public abstract @NotNull ModCommand surroundElements(@NotNull ActionContext context, @NotNull PsiElement @NotNull [] elements);
 
   @Override
-  public final @Nullable TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements)
-    throws IncorrectOperationException {
+  public final @Nullable TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     if (elements.length == 0) {
       return null;
     }
diff --git a/platform/lang-api/src/com/intellij/lang/surroundWith/Surrounder.java b/platform/lang-api/src/com/intellij/lang/surroundWith/Surrounder.java
index 3f68b4d7c901..d3b545b7a600 100644
--- a/platform/lang-api/src/com/intellij/lang/surroundWith/Surrounder.java
+++ b/platform/lang-api/src/com/intellij/lang/surroundWith/Surrounder.java
@@ -9,7 +9,6 @@ import com.intellij.openapi.util.NlsActions;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayFactory;
-import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -53,5 +52,5 @@ public interface Surrounder extends WriteActionAware {
   @Nullable
   TextRange surroundElements(@NotNull Project project,
                              @NotNull Editor editor,
-                             PsiElement @NotNull [] elements) throws IncorrectOperationException;
+                             PsiElement @NotNull [] elements);
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyExpressionSurrounder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyExpressionSurrounder.java
index eea101b5f72f..522f6db07002 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyExpressionSurrounder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyExpressionSurrounder.java
@@ -20,7 +20,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
@@ -32,7 +31,7 @@ public abstract class GroovyExpressionSurrounder implements Surrounder {
 
   @Override
   @Nullable
-  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) throws IncorrectOperationException {
+  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     if (elements.length != 1) return null;
 
     PsiElement element = elements[0];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyManyStatementsSurrounder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyManyStatementsSurrounder.java
index d2cb1f7c5ad0..f5e6dce61672 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyManyStatementsSurrounder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/GroovyManyStatementsSurrounder.java
@@ -54,7 +54,7 @@ public abstract class GroovyManyStatementsSurrounder implements Surrounder {
 
   @Override
   @Nullable
-  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) throws IncorrectOperationException {
+  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     if (elements.length == 0) return null;
 
     PsiElement element1 = elements[0];
diff --git a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/surroundWith/KotlinRuntimeTypeCastSurrounder.kt b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/surroundWith/KotlinRuntimeTypeCastSurrounder.kt
index afeaac56a97d..66c71ee5d077 100644
--- a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/surroundWith/KotlinRuntimeTypeCastSurrounder.kt
+++ b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/surroundWith/KotlinRuntimeTypeCastSurrounder.kt
@@ -50,7 +50,7 @@ class KotlinRuntimeTypeCastSurrounder : Surrounder {
         return TypeUtils.canHaveSubtypes(KotlinTypeChecker.DEFAULT, type)
     }
 
-    override fun surroundElements(project: Project, editor: Editor, elements: Array<out PsiElement?>): TextRange? {
+    override fun surroundElements(project: Project, editor: Editor, elements: Array<PsiElement>): TextRange? {
         val expression = elements.singleOrNull() as? KtExpression ?: return null
         val debuggerContext = DebuggerManagerEx.getInstanceEx(project).context
         val debuggerSession = debuggerContext.debuggerSession
diff --git a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
index e85da7706d16..89b5824424df 100644
--- a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
+++ b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
@@ -26,8 +26,7 @@ public abstract class PyExpressionSurrounder implements Surrounder {
     throws IncorrectOperationException;
 
   @Override
-  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements)
-    throws IncorrectOperationException {
+  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     return surroundExpression(project, editor, (PyExpression)elements[0]);
   }
 }
diff --git a/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java b/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
index b26b8e12db76..1f0f7941ff93 100644
--- a/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
+++ b/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
@@ -23,8 +23,7 @@ public abstract class PyStatementSurrounder implements Surrounder {
     throws IncorrectOperationException;
 
   @Override
-  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements)
-    throws IncorrectOperationException {
+  public TextRange surroundElements(@NotNull Project project, @NotNull Editor editor, PsiElement @NotNull [] elements) {
     return surroundStatement(project, editor, elements);
   }
 }