diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
index 558ae55ecce..b5ed66b250f 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
@@ -1,2 +1,12 @@
+@ECHO OFF
+IF NOT "%A_PLUGIN_PATH%"=="" GOTO DoneSetup
+IF EXIST setup.bat GOTO HaveSetup
+ECHO.
+ECHO Please run setup.bat before running daemon.bat
+PAUSE
+GOTO Done
+:HaveSetup
+CALL setup.bat
+:DoneSetup
 java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.ServerLauncher
-
+:Done