diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index 507d7cc1f5c..289fd413f04 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -3302,7 +3302,10 @@ public class SystemViewRemoteFileAdapter
 					
 					IEditorPart editor = editable.getEditorPart();
 					boolean editorWasClosed = false;
-					if (editor.isDirty()){
+					if (editor == null){
+						editorWasClosed = true;
+					}
+					else if (editor.isDirty()){
 						editorWasClosed = editor.getEditorSite().getPage().closeEditor(editor, true);
 						if (editorWasClosed)
 							editable.doImmediateSaveAndUpload();