diff --git a/comodo2/src/comodo2/templates/qpc/c/StateMachineSource.java b/comodo2/src/comodo2/templates/qpc/c/StateMachineSource.java
index 0c90092..be00ecb 100644
--- a/comodo2/src/comodo2/templates/qpc/c/StateMachineSource.java
+++ b/comodo2/src/comodo2/templates/qpc/c/StateMachineSource.java
@@ -709,6 +709,9 @@ else if (t.getTarget() instanceof State){
 	 * Returns the QPC-specific return statement for a transition to stateName
 	 */
 	public String transitionToStateMacro(State s){
+		if (s == null){
+			return null;
+		}
 		if (Objects.equal(s.getName(), "")){
 			return null;
 		}