diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
index 9f997821..0df33bbb 100644
--- a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
+++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
@@ -130,7 +130,7 @@
           <spiffworkflow:property name="formUiSchemaFilename" value="Submit-the-invoice_UISchema.json" />
         </spiffworkflow:properties>
         <spiffworkflow:postScript>len_invoice_comments = len(invoice["commentSubmitter"].strip())</spiffworkflow:postScript>
-        <spiffworkflow:preScript></spiffworkflow:preScript>
+        <spiffworkflow:preScript />
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_17vkjgc</bpmn:incoming>
       <bpmn:outgoing>Flow_02moyg7</bpmn:outgoing>
@@ -173,7 +173,7 @@ del datetime</bpmn:script>
       <bpmn:endEvent id="Event_015l7j8">
         <bpmn:incoming>Flow_04odmtl</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:sequenceFlow id="Flow_1avkxpe" sourceRef="Event_1qkuk5g" targetRef="Activity_check_contributor_name" />
+      <bpmn:sequenceFlow id="Flow_1avkxpe" sourceRef="Event_1qkuk5g" targetRef="Activity_1sixbqq" />
       <bpmn:scriptTask id="Activity_check_contributor_name" name="Check Contributor Name" scriptFormat="python">
         <bpmn:extensionElements>
           <spiffworkflow:unitTests>
@@ -186,7 +186,7 @@ del datetime</bpmn:script>
             </spiffworkflow:unitTest>
           </spiffworkflow:unitTests>
         </bpmn:extensionElements>
-        <bpmn:incoming>Flow_1avkxpe</bpmn:incoming>
+        <bpmn:incoming>Flow_0daehm5</bpmn:incoming>
         <bpmn:outgoing>Flow_0mvmd06</bpmn:outgoing>
         <bpmn:script>svc_is_num_in_name = False
 for c in invoice.contributorName:
@@ -238,6 +238,16 @@ else:
     invoice["invoiceStatus"] = "Invoice validation failed"</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="Flow_04odmtl" sourceRef="Activity_1j8k6mb" targetRef="Event_015l7j8" />
+      <bpmn:sequenceFlow id="Flow_0daehm5" sourceRef="Activity_1sixbqq" targetRef="Activity_check_contributor_name" />
+      <bpmn:scriptTask id="Activity_1sixbqq" name="Check Submitter Comment">
+        <bpmn:incoming>Flow_1avkxpe</bpmn:incoming>
+        <bpmn:outgoing>Flow_0daehm5</bpmn:outgoing>
+        <bpmn:script># Check if Submiter entered comment
+try:
+  invoice["commentSubmitter"]
+except NameError:
+  invoice["commentSubmitter"] = ""</bpmn:script>
+      </bpmn:scriptTask>
     </bpmn:subProcess>
     <bpmn:intermediateThrowEvent id="Event_invoice_validation_failed" name="Invoice validation failed">
       <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
@@ -1789,9 +1799,6 @@ ___
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_0e5tdrz">
     <bpmndi:BPMNPlane id="BPMNPlane_04v9fws" bpmnElement="SubProcess_Data_validation_rules">
-      <bpmndi:BPMNShape id="Event_1qkuk5g_di" bpmnElement="Event_1qkuk5g">
-        <dc:Bounds x="232" y="192" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_05nw8eq_di" bpmnElement="Activity_Check_Due_Date">
         <dc:Bounds x="840" y="170" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -1814,9 +1821,15 @@ ___
       <bpmndi:BPMNShape id="Activity_0u1e062_di" bpmnElement="Activity_1j8k6mb">
         <dc:Bounds x="1200" y="170" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1qkuk5g_di" bpmnElement="Event_1qkuk5g">
+        <dc:Bounds x="42" y="192" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0r298mg_di" bpmnElement="Activity_1sixbqq">
+        <dc:Bounds x="150" y="170" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1avkxpe_di" bpmnElement="Flow_1avkxpe">
-        <di:waypoint x="268" y="210" />
-        <di:waypoint x="340" y="210" />
+        <di:waypoint x="78" y="210" />
+        <di:waypoint x="150" y="210" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0tzjowk_di" bpmnElement="Flow_0tzjowk">
         <di:waypoint x="1120" y="210" />
@@ -1842,6 +1855,10 @@ ___
         <di:waypoint x="1300" y="210" />
         <di:waypoint x="1362" y="210" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0daehm5_di" bpmnElement="Flow_0daehm5">
+        <di:waypoint x="250" y="210" />
+        <di:waypoint x="340" y="210" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1wh5lkq">