diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java
index 03d8c8a6ab73..1c594abefb6c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchFinallySurrounder.java
@@ -11,7 +11,7 @@ public class KotlinTryCatchFinallySurrounder extends KotlinTrySurrounderBase {
 
     @Override
     protected String getCodeTemplate() {
-        return "try { \n} catch(e: Exception) {\nTODO()\n} finally {\n}";
+        return "try { \n} catch(e: Exception) {\nTODO(\"Not yet implemented\")\n} finally {\n}";
     }
 
     @NotNull
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java
index eb183fcc7284..afc194be4c7c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTryCatchSurrounder.java
@@ -11,7 +11,7 @@ public class KotlinTryCatchSurrounder extends KotlinTrySurrounderBase {
 
     @Override
     protected String getCodeTemplate() {
-        return "try { \n} catch(e: Exception) {\nTODO()\n}";
+        return "try { \n} catch(e: Exception) {\nTODO(\"Not yet implemented\")\n}";
     }
 
     @NotNull
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/try.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/try.kt.after
index 863dc0b20df9..a47665e725f7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/try.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/try.kt.after
@@ -2,6 +2,6 @@ fun foo(x: Boolean) {
     try {
         x
     } catch (e: Exception) {
-        TODO()
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnFor.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnFor.kt.after
index bd586bc624e7..25ebbeec3295 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnFor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnFor.kt.after
@@ -3,6 +3,6 @@ fun foo() {
         for (i in 1..100) {
         }
     } catch (e: Exception) {
-        TODO()
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnStatement.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnStatement.kt.after
index ffe30c84b627..12867f0001ff 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnStatement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/tryOnStatement.kt.after
@@ -2,6 +2,6 @@ fun foo() {
     try {
         val x = 1
     } catch (e: Exception) {
-        TODO()
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt.after
index d14a2c6cfd1e..0c434185cea6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt.after
@@ -4,7 +4,7 @@ fun foo() {
         a = "aaa"
         "aaa"
     } catch (e: <selection>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     }
 
     a.charAt(1)
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt.after
index 7c079eb80d5d..bb53c32d7110 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOutSingleStatement.kt.after
@@ -2,7 +2,7 @@ fun foo() {
     val a = try {
         "aaa"
     } catch (e: <selection><caret>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     }
 
     a.charAt(1)
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt.after
index 7161e0265b56..7f500efdb70c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt.after
@@ -3,6 +3,6 @@ fun foo() {
         "aaa"
         "aaa"
     } catch (e: <selection>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt.after
index 416fc5390c6a..f496e6dfd9ed 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt.after
@@ -2,6 +2,6 @@ fun foo() {
     try {
         "aaa"
     } catch (e: <selection>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt.after
index eed730fb0beb..7fbc5d74b75e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt.after
@@ -3,7 +3,7 @@ fun foo() {
         "aaa"
         "aaa"
     } catch (e: <selection>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     } finally {
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt.after
index 50df5a3bcfbc..0b8efa7fe82e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt.after
@@ -2,7 +2,7 @@ fun foo() {
     try {
         "aaa"
     } catch (e: <selection>Exception</selection>) {
-        TODO()
+        TODO("Not yet implemented")
     } finally {
     }
 }
\ No newline at end of file