1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
index 056f21049..b2274c526 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.tcf.internal.debug.ui.model;
 
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -1962,6 +1963,9 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
             if (!multiline && error instanceof IErrorReport) {
                 msg = Command.toErrorString(((IErrorReport)error).getAttributes());
             }
+            else if (error instanceof UnknownHostException) {
+                msg = "Unknown host: " + error.getMessage();
+            }
             else {
                 msg = error.getLocalizedMessage();
             }
@@ -1976,8 +1980,8 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
                 else if (ch != '.' && ch != ';') {
                     buf.append(';');
                 }
-                buf.append("Caused by:");
-                buf.append(multiline ? '\n' : ' ');
+                if (multiline) buf.append("Caused by:\n");
+                else buf.append(' ');
             }
         }
         if (buf.length() > 0) {