diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java
index d2da66f9f22..ba49179c559 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/NetworkPortMap.java
@@ -11,7 +11,7 @@
  * Helmut Haigermoser and Ted Williams.
  *
  * Contributors:
- * Michael Scharf (Wind River) - extracted from TerminalConsts 
+ * Michael Scharf (Wind River) - extracted from TerminalNetworkPortMap 
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  *******************************************************************************/
 package org.eclipse.tm.terminal.internal.telnet;
diff --git a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
index 87c71aed8af..4b59c94eb99 100644
--- a/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
+++ b/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/telnet/TelnetSettingsPage.java
@@ -66,8 +66,9 @@ public class TelnetSettingsPage implements ISettingsPage {
 	private void setNetworkPort(String strNetworkPort) {
 		if (strNetworkPort!=null) {
 			String strPortName = getNetworkPortMap().findPortName(strNetworkPort);
-			if(strPortName==null)
-				strPortName=""; //$NON-NLS-1$
+			if(strPortName==null) {
+				strPortName=strNetworkPort; //fallback to verbatim port if not found
+			}
 			int nIndex = fNetworkPortCombo.indexOf(strPortName);
 
 			if (nIndex == -1) {