diff --git a/runtime/scripts/marking.js b/runtime/scripts/marking.js
index 867df8645..e1ae5b153 100644
--- a/runtime/scripts/marking.js
+++ b/runtime/scripts/marking.js
@@ -619,15 +619,16 @@ Numbas.queueScript('marking',['util', 'jme','localisation','jme-variables','math
                     credit = credit.subtract(Fraction.fromFloat(state.credit));
                     break;
                 case FeedbackOps.END:
+                    out_states.push(state);
+                    if(state.invalid) {
+                        valid = false;
+                    }
                     if(num_lifts) {
                         while(i+1<states.length && states[i+1].op!="end_lift") {
                             i += 1;
                         }
                     } else {
                         end = true;
-                        if(state.invalid) {
-                            valid = false;
-                        }
                     }
                     break;
                 case FeedbackOps.CONCAT:
diff --git a/runtime/scripts/part.js b/runtime/scripts/part.js
index e503a1cef..e89c35a92 100644
--- a/runtime/scripts/part.js
+++ b/runtime/scripts/part.js
@@ -1705,15 +1705,15 @@ if(res) { \
                     part.markingComment(state.message,state.reason, state.format);
                     break;
                 case FeedbackOps.END:
+                    if(state.invalid) {
+                        valid = false;
+                    }
                     if(lifts.length) {
                         while(i+1<states.length && states[i+1].op!="end_lift") {
                             i += 1;
                         }
                     } else {
                         end = true;
-                        if(state.invalid) {
-                            valid = false;
-                        }
                     }
                     break;
                 case "start_lift":