diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index b681f02ac1503fe6c0c40fd030b9e4653c34fa9e..3169347099068ae7aef97e0cdc869aba9e0a7aa5 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -258,8 +258,8 @@ void start() throws KeywordSearchModuleException {
             final String SOLR_START_CMD = javaPath + MAX_SOLR_MEM_MB_PAR + " -DSTOP.PORT=8079 -DSTOP.KEY=" + KEY + " "
                     + loggingProperties + " -jar start.jar";
             logger.log(Level.INFO, "Starting Solr using: " + SOLR_START_CMD);
-
             curSolrProcess = Runtime.getRuntime().exec(SOLR_START_CMD, null, solrFolder);
+            logger.log(Level.INFO, "Finished starting Solr");
 
             try {
                 //block, give time to fully start the process
@@ -293,7 +293,10 @@ synchronized void stop() throws KeywordSearchModuleException {
             logger.log(Level.INFO, "Stopping Solr server from: " + solrFolder.getAbsolutePath());
             //try graceful shutdown
             Process stop = Runtime.getRuntime().exec(javaPath + " -DSTOP.PORT=8079 -DSTOP.KEY=" + KEY + " -jar start.jar --stop", null, solrFolder);
+            logger.log(Level.INFO, "Waiting for stopping Solr server");
             stop.waitFor();
+            logger.log(Level.INFO, "Finished stopping Solr server");
+            
             //if still running, forcefully stop it
             if (curSolrProcess != null) {
                 curSolrProcess.destroy();