diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 838ed3f..28158ff 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -413,8 +413,8 @@ public class TestingList extends Panel {
                 }
             }
             catch (Exception ex) {
-                SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
                 this.setButtonToStop();
+                SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
             }
             finally{
                 return dsTestProperties;
@@ -489,7 +489,10 @@ public class TestingList extends Panel {
                         args.put("status", false);                        
                         run(sTestName, args);
                     } catch (Exception ex) {
-                        SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
+                        SwingUtils.showMessage(this, "executeTest()", ex.toString());
+                        logger.log(Level.SEVERE, ex.toString());
+                        showResult(sDeviceName, sTestName, ex.toString(), "Failure");
+                        setButtonToStop();
                     }
                 } 
             }