diff --git a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
index 36a2e14064..9373a07bd7 100644
--- a/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
+++ b/core/src/main/java/org/lflang/federated/launcher/FedLauncherGenerator.java
@@ -206,7 +206,10 @@ public void doGenerate(List<FederateInstance> federates, RtiConfig rtiConfig) {
                 "wait $RTI || EXITED_SUCCESSFULLY=false",
                 "for pid in \"${pids[@]}\"",
                 "do",
-                "    wait $pid || EXITED_SUCCESSFULLY=false",
+                "    wait $pid",
+                "    if [ $? -ne 0 -a $? -ne 127 ]; then",
+                "        EXITED_SUCCESSFULLY=false",
+                "    fi",
                 "done",
                 "echo \"All done.\""))
         .append("\n");