diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java b/java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java
index a08efdc933e1..65f7b9c00ae0 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/RemoteConnection.java
@@ -25,8 +25,8 @@ public class RemoteConnection {
   private boolean myServerMode;
   private String myHostName;
   private String myAddress;
-  @NonNls public static final String ONTHROW = ",onthrow=<FQ exception class name>";
-  @NonNls public static final String ONUNCAUGHT = ",onuncaught=<y/n>";
+  public static final String ONTHROW = ",onthrow=<FQ exception class name>";
+  public static final String ONUNCAUGHT = ",onuncaught=<y/n>";
 
   public RemoteConnection(boolean useSockets, String hostName, String address, boolean serverMode) {
     myUseSockets = useSockets;
@@ -77,8 +77,7 @@ public class RemoteConnection {
     if (shmem) {
       if (serverMode) {
         result = "-Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" +
-                 ((address.length() > 0)? address : "...") +
-                 ONTHROW + ",suspend=y" + ONUNCAUGHT;
+                 ((address.length() > 0)? address : "...") + ",suspend=y" + ONTHROW + ONUNCAUGHT;
       }
       else {
         result = "-Xdebug -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=" +
@@ -104,8 +103,7 @@ public class RemoteConnection {
         catch (UnknownHostException e) {
         }
         result = "-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" + localHostName +
-                 ((p == -1)? "<port>" : Integer.toString(p)) +
-                 ONTHROW + ",suspend=y" + ONUNCAUGHT;
+                 ((p == -1)? "<port>" : Integer.toString(p)) + ",suspend=y" + ONTHROW + ONUNCAUGHT;
       }
       else {
         result = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=" +