diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
index f6c143f40d5..8444bae3f4f 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
@@ -3962,8 +3962,8 @@ public final class DataStore
 	{
 		// dy: the call to flush deletes all the elements in the tree
 		// which causes havoc for iSeries caching when switching between offline / online
-		if (isVirtual())
-			flush();
+		//if (isVirtual())
+		//	flush();
 
 
 		if (_tracingOn)
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
index f25e3f0c3a5..bbb3d61e6b9 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
@@ -293,11 +293,14 @@ public class ServerLauncher extends Thread {
 						_errReader = new BufferedReader(new InputStreamReader(_serverProcess.getErrorStream()));
 						BufferedWriter inWriter  = new BufferedWriter(new OutputStreamWriter(_serverProcess.getOutputStream()));
 						// write password
-						inWriter.write(password);
-						inWriter.newLine();
-						inWriter.flush();
+						if (password != null)
+						{
+							inWriter.write(password);
+							inWriter.newLine();
+							inWriter.flush();
 						
-						launchStatus = _outReader.readLine();
+							launchStatus = _outReader.readLine();
+						}
 					}
 					else
 					{