diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
index 1f16af8ea..7e1697ce2 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: LogScriptEngine.java,v 1.10 2009/04/03 17:05:14 fros4943 Exp $
+ * $Id: LogScriptEngine.java,v 1.11 2009/04/23 10:41:35 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -338,7 +338,6 @@ public class LogScriptEngine {
         /*logger.info("test script thread starts");*/
         try {
           ((Invocable)engine).getInterface(Runnable.class).run();
-
         } catch (RuntimeException e) {
           Throwable throwable = e;
           while (throwable.getCause() != null) {
@@ -347,7 +346,7 @@ public class LogScriptEngine {
 
           if (throwable.getMessage() != null &&
               throwable.getMessage().contains("test script killed") ) {
-            /*logger.info("test script thread terminated by exception");*/
+            logger.info("Test script finished");
           } else {
             if (!GUI.isVisualized()) {
               logger.fatal("Test script error, terminating Cooja.");
@@ -356,8 +355,8 @@ public class LogScriptEngine {
             }
 
             logger.fatal("Script error:", e);
-            gui.getSimulation().stopSimulation();
             deactivateScript();
+            gui.getSimulation().stopSimulation();
           }
         }
         /*logger.info("test script thread exits");*/