diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java
index 37c85c3a3..355e654a4 100644
--- a/tools/cooja/java/se/sics/cooja/GUI.java
+++ b/tools/cooja/java/se/sics/cooja/GUI.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: GUI.java,v 1.78 2008/09/18 14:04:13 fros4943 Exp $
+ * $Id: GUI.java,v 1.79 2008/09/18 14:24:46 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -3112,6 +3112,7 @@ public class GUI extends Observable {
 
             /* Activate test */
             scriptPlugin.activateTest(configFile, scriptFile, logFile);
+            System.exit(1);
           }
         }
       });
diff --git a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunnerNoGUI.java b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunnerNoGUI.java
index 90d9fa98a..bbf89aff5 100644
--- a/tools/cooja/java/se/sics/cooja/plugins/ScriptRunnerNoGUI.java
+++ b/tools/cooja/java/se/sics/cooja/plugins/ScriptRunnerNoGUI.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ScriptRunnerNoGUI.java,v 1.1 2008/04/22 13:05:18 fros4943 Exp $
+ * $Id: ScriptRunnerNoGUI.java,v 1.2 2008/09/18 14:24:46 fros4943 Exp $
  */
 
 package se.sics.cooja.plugins;
@@ -170,10 +170,13 @@ public class ScriptRunnerNoGUI implements Plugin {
       /* Start simulation and leave control to script */
       sim.startSimulation();
     } catch (IOException e) {
+      logger.fatal("Error when running script: " + e);
       return false;
     } catch (UnsatisfiedLinkError e) {
+      logger.fatal("Error when running script: " + e);
       return false;
     } catch (SimulationCreationException e) {
+      logger.fatal("Error when running script: " + e);
       return false;
     }