diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 8923cdb..94f7a58 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -1579,8 +1579,7 @@ public class TestingList extends Panel {
                         }
                     }
                     //System.out.println(sParallelizeCommand);
-                    Object ret;
-                    ret = eval(sParallelizeCommand);
+                    Object ret = eval(sParallelizeCommand);
                     //System.out.println(ret);
                     String sTestResult, sTestStatus;
                     if(ret == null){
@@ -1618,7 +1617,7 @@ public class TestingList extends Panel {
                 }  catch (StatementException intEx) {
                     Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, intEx);
                     System.out.println("User interrupted test! |"+ sDeviceName+"|"+ sTestPath+"|"+ String.valueOf(intEx));
-                    stopAll("User interrupted test");
+                    stopAll("Test stopped by user");
                     //showResult(sDeviceName, sTestPath, "User interrupted test", "false");
                     //setToStopped();
                 } catch (ClassCastException ccex) {
diff --git a/script/tests/config/LabTests b/script/tests/config/LabTests
index 5721c11..66762d6 100644
Binary files a/script/tests/config/LabTests and b/script/tests/config/LabTests differ
diff --git a/script/tests/templates/testTemplate.py b/script/tests/templates/testTemplate.py
index 1a8ff16..86bdb8e 100644
--- a/script/tests/templates/testTemplate.py
+++ b/script/tests/templates/testTemplate.py
@@ -125,6 +125,11 @@ def startTest(testName, DEVICE, params):
         
         #just in case the feedback was forgotten
         test.sendFeedback(ret, success)
+    except (KeyboardInterrupt):
+        #user stop error handler
+        ret = 'Test stopped by user.'
+        success = False
+        test.sendFeedback(ret, success)
     except:
         #generic error handler
         ret = traceback.format_exc()
diff --git a/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py b/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py
index dc2fa57..7d31f26 100644
--- a/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py	
+++ b/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py	
@@ -100,6 +100,11 @@ def startTest(testName, DEVICE, params):
         
         #just in case the feedback was forgotten
         test.sendFeedback(ret, success)
+    except (KeyboardInterrupt):
+        #user stop error handler
+        ret = 'Test stopped by user.'
+        success = False
+        test.sendFeedback(ret, success)
     except:
         #generic error handler
         ret = traceback.format_exc()
diff --git a/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py b/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py
index e5826b9..8f4baaa 100644
--- a/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py	
+++ b/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py	
@@ -95,6 +95,11 @@ def startTest(testName, DEVICE, params):
         
         #just in case the feedback was forgotten
         test.sendFeedback(ret, success)
+    except (KeyboardInterrupt):
+        #user stop error handler
+        ret = 'Test stopped by user.'
+        success = False
+        test.sendFeedback(ret, success)
     except:
         #generic error handler
         ret = traceback.format_exc()
diff --git a/script/tests/tests/PS Tests/test without ioc/test without ioc.py b/script/tests/tests/PS Tests/test without ioc/test without ioc.py
index 0483998..582614b 100644
--- a/script/tests/tests/PS Tests/test without ioc/test without ioc.py	
+++ b/script/tests/tests/PS Tests/test without ioc/test without ioc.py	
@@ -136,6 +136,11 @@ def startTest(testName, DEVICE, params):
         
         #just in case the feedback was forgotten
         test.sendFeedback(ret, success)
+    except (KeyboardInterrupt):
+        #user stop error handler
+        ret = 'Test stopped by user.'
+        success = False
+        test.sendFeedback(ret, success)
     except:
         #generic error handler
         ret = traceback.format_exc()