diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java
index 1a4758b6761..41a629e1fde 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java
@@ -409,7 +409,7 @@ public class ExternalExecutablesDialog extends TrayDialog {
 	 */
 	public void setExecutableData(Map<String, String> data) {
 		if (data == null) {
-			executableData = data;
+			executableData = null;
 		} else {
 			executableData = new HashMap<String, String>(data);
 		}
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java
index b1d23db2302..b8debd3640c 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesManager.java
@@ -285,7 +285,7 @@ public class ExternalExecutablesManager {
 		}
 
 		// if the icon is still to big -> downscale the biggest
-		if (id.height > 16 && id.width > 16) {
+		if (id != null && id.height > 16 && id.width > 16) {
 			id = biggest.scaledTo(16, 16);
 		}