Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -ra98f9ee6b2314f8d98764222a580a896840815f1 -rbf9a2a05483a188c075023bc3f3cbb93e8d2ca5f
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision a98f9ee6b2314f8d98764222a580a896840815f1)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision bf9a2a05483a188c075023bc3f3cbb93e8d2ca5f)
@@ -1253,7 +1253,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_SYRINGE_INVALID_STATE, syringePumpState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_SYRINGE_INVALID_STATE, syringePumpState );
             break;
     }
 
@@ -2316,7 +2316,8 @@
                 break;
 
             default:
-                // Ok, just ignore and we will return FALSE rejecting request
+                // Software Fault
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, op );
                 break;
         }
     }
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -rbf9a2a05483a188c075023bc3f3cbb93e8d2ca5f
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision bf9a2a05483a188c075023bc3f3cbb93e8d2ca5f)
@@ -21,6 +21,7 @@
 #include "EjectorMotor.h"
 #include "FPGA.h"
 #include "InternalADC.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "TaskPriority.h"
 #include "WatchdogMgmt.h"
@@ -71,6 +72,15 @@
         // Monitor air trap level sensors
         execAirTrapMonitor();
 
+
+#ifndef _RELEASE_
+//        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            // Control/Monitor syringe pump
+            execSyringePump();
+        }
+
         // Monitor air bubble detectors
         execBubbles();