diff --git a/Modules/Mainframe/PMs/PMModule.cs b/Modules/Mainframe/PMs/PMModule.cs
index dd6bb336..1a121e39 100644
--- a/Modules/Mainframe/PMs/PMModule.cs
+++ b/Modules/Mainframe/PMs/PMModule.cs
@@ -836,6 +836,7 @@ namespace SicModules.PMs
 
         private bool FsmEnterError(object[] param)
         {
+            AbortRoutine();
             InvokeOnEnterError(Module);
             if (IsOnline)
             {
@@ -1363,8 +1364,7 @@ namespace SicModules.PMs
             {
                 return false;
             }
-
-            AbortRoutine();
+            
             StopRamp();
             _pmInterLock.SetPMProcessRunning(false, out string reason);
             _pmInterLock.SetPMPreProcessRunning(false, out reason);