diff --git a/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java
index 474ec528e7cf..4aacb05afcce 100644
--- a/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/EditorMacro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public abstract class EditorMacro extends Macro {
   }
 
   @Override
-  public final String expand(DataContext dataContext) throws ExecutionCancelledException {
+  public final String expand(DataContext dataContext) {
     Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
     if (editor != null){
       return expand(editor);
diff --git a/platform/lang-impl/src/com/intellij/ide/macro/Macro.java b/platform/lang-impl/src/com/intellij/ide/macro/Macro.java
index fe11a876f494..be8ea6eccc67 100644
--- a/platform/lang-impl/src/com/intellij/ide/macro/Macro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/Macro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package com.intellij.ide.macro;
 
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NonNls;
@@ -86,7 +85,7 @@ public abstract class Macro {
     }
 
     @Override
-    public String expand(DataContext dataContext) throws ExecutionCancelledException {
+    public String expand(DataContext dataContext) {
       return myValue;
     }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/macro/ModuleSdkPathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/ModuleSdkPathMacro.java
index 6aa74931ec27..c913abd6a1cc 100644
--- a/platform/lang-impl/src/com/intellij/ide/macro/ModuleSdkPathMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/ModuleSdkPathMacro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public class ModuleSdkPathMacro extends Macro {
 
   @Nullable
   @Override
-  public String expand(DataContext dataContext) throws ExecutionCancelledException {
+  public String expand(DataContext dataContext) {
     final Module module = LangDataKeys.MODULE.getData(dataContext);
     if (module == null) {
       return null;
diff --git a/platform/lang-impl/src/com/intellij/ide/macro/UnixSeparatorsMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/UnixSeparatorsMacro.java
index 29fee57b4f1c..813296af3182 100644
--- a/platform/lang-impl/src/com/intellij/ide/macro/UnixSeparatorsMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/UnixSeparatorsMacro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public final class UnixSeparatorsMacro extends Macro implements SecondQueueExpan
 
   @Nullable
   @Override
-  public String expand(DataContext dataContext) throws ExecutionCancelledException {
+  public String expand(DataContext dataContext) {
     return null;
   }
 }
diff --git a/python/src/com/jetbrains/python/sdk/InterpreterDirectoryMacro.java b/python/src/com/jetbrains/python/sdk/InterpreterDirectoryMacro.java
index 35e1aadfb98a..baf882b6325e 100644
--- a/python/src/com/jetbrains/python/sdk/InterpreterDirectoryMacro.java
+++ b/python/src/com/jetbrains/python/sdk/InterpreterDirectoryMacro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class InterpreterDirectoryMacro extends Macro {
 
   @Nullable
   @Override
-  public String expand(DataContext dataContext) throws ExecutionCancelledException {
+  public String expand(DataContext dataContext) {
     Module module = LangDataKeys.MODULE.getData(dataContext);
     if (module == null) {
       Project project = CommonDataKeys.PROJECT.getData(dataContext);