diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
index e8a866eb885..2e392eb036e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
@@ -362,8 +362,12 @@ public class DStoreHostFile implements IHostFile
 		if (str == null)
 		{
 			System.out.println("HELP:"+_element.toString()); //$NON-NLS-1$
+			return false;
+		}
+		else
+		{
+			return(str.equals("true")); //$NON-NLS-1$
 		}
-		return(str.equals("true")); //$NON-NLS-1$
 	}
 
 	public boolean canWrite() {
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java
index cbb2f75ebaa..2cc0f18f5d9 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreInputStream.java
@@ -30,7 +30,7 @@ public class DStoreInputStream extends InputStream
 	private DataElement _minerElement;
 	private String _encoding;
 	private int _mode;
-	private DataElement _cmdStatus;
+	private DataElement _cmdStatus; // leaving this, in case of need for error checking
 	private File _localFile;
 	private InputStream _localFileInputStream;
 	
@@ -52,7 +52,7 @@ public class DStoreInputStream extends InputStream
 		
 		try
 		{
-			_localFile = File.createTempFile("download", "rse");
+			_localFile = File.createTempFile("download", "rse");  //$NON-NLS-1$//$NON-NLS-2$
 			DataElement remoteElement = ds.createObject(universaltemp, de.getType(), _remotePath, String.valueOf(_mode));	
 			DataElement localElement = ds.createObject(universaltemp, de.getType(), _localFile.getAbsolutePath(), _encoding);
 			
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java
index 079ea113976..bd7a9977d7f 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/StatusChangeListener.java
@@ -314,9 +314,7 @@ public class StatusChangeListener implements IDomainListener
         return getStatus().getAttribute(DE.A_VALUE).equals("done") ||  getStatus().getAttribute(DE.A_NAME).equals("done"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.ICommunicationsListener#isPassiveCommunicationsListener()
-	 */
+
 	public boolean isPassiveCommunicationsListener() {
 		return false;
 	}