diff --git a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextExporter.java b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextExporter.java
index 2f8369c118c..bf6ef75b2a2 100644
--- a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextExporter.java
+++ b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextExporter.java
@@ -202,9 +202,10 @@ public class PlainTextExporter implements IMemoryExporter {
 				dialog.setFileName(fFileText.getText());
 				dialog.open();
 			
-				if(dialog.getFileName() != null)
+				String filename = dialog.getFileName();
+				if(filename != null && filename.length() != 0 )
 				{
-					fFileText.setText(dialog.getFilterPath() + File.separator + dialog.getFileName());
+					fFileText.setText(dialog.getFilterPath() + File.separator + filename);
 				}
 				
 				validate();
diff --git a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextImporter.java b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextImporter.java
index 417f79b46d3..9b676a5f2f1 100644
--- a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextImporter.java
+++ b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/PlainTextImporter.java
@@ -177,9 +177,10 @@ public class PlainTextImporter implements IMemoryImporter {
 				dialog.setFileName(fFileText.getText());
 				dialog.open();
 			
-				if(dialog.getFileName() != null)
+				String filename = dialog.getFileName();
+				if(filename != null && filename.length() != 0 )
 				{
-					fFileText.setText(dialog.getFilterPath() + File.separator + dialog.getFileName());
+					fFileText.setText(dialog.getFilterPath() + File.separator + filename);
 				}
 				
 				validate();
diff --git a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordExporter.java b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordExporter.java
index dfd253ee40b..9f13f1be043 100644
--- a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordExporter.java
+++ b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordExporter.java
@@ -198,9 +198,10 @@ public class SRecordExporter implements IMemoryExporter
 				dialog.setFileName(fFileText.getText());
 				dialog.open();
 			
-				if(dialog.getFileName() != null)
+				String filename = dialog.getFileName();
+				if(filename != null && filename.length() != 0 )
 				{
-					fFileText.setText(dialog.getFilterPath() + File.separator + dialog.getFileName());
+					fFileText.setText(dialog.getFilterPath() + File.separator + filename);
 				}
 				
 				validate();
diff --git a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordImporter.java b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordImporter.java
index 3d09177cd80..5e4c8b4e6df 100644
--- a/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordImporter.java
+++ b/plugins/org.eclipse.dd.debug.ui.memory.transport/src/org/eclipse/dd/debug/ui/memory/transport/SRecordImporter.java
@@ -172,9 +172,10 @@ public class SRecordImporter implements IMemoryImporter {
 				dialog.setFileName(fFileText.getText());
 				dialog.open();
 			
-				if(dialog.getFileName() != null)
+				String filename = dialog.getFileName();
+				if(filename != null && filename.length() != 0 )
 				{
-					fFileText.setText(dialog.getFilterPath() + File.separator + dialog.getFileName());
+					fFileText.setText(dialog.getFilterPath() + File.separator + filename);
 				}
 				
 				validate();