diff --git a/benchmarks/dis/dis.sh b/benchmarks/dis/dis.sh
index a31c8afab5d399e7c3bde16cd66a024a911cb9f8..f34e543cf3f204205871168ac5a99c1c3f8fef3f 100755
--- a/benchmarks/dis/dis.sh
+++ b/benchmarks/dis/dis.sh
@@ -92,11 +92,11 @@ for rec in options/*.py ; do
   [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
   JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
     gaudirun.py ${rec}
+  if [ "$?" -ne "0" ] ; then
+    echo "ERROR running juggler"
+    exit 1
+  fi
 done
-if [ "$?" -ne "0" ] ; then
-  echo "ERROR running juggler"
-  exit 1
-fi
 
 ## =============================================================================
 ## Step 4: Analysis
diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh
index 2e762a36f783883c071bac13dfeceba524d5a601..4b26aef0a3835429b475e7fb8ffc5e92be4e510e 100644
--- a/benchmarks/dvcs/dvcs.sh
+++ b/benchmarks/dvcs/dvcs.sh
@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 
diff --git a/benchmarks/dvmp/dvmp.sh b/benchmarks/dvmp/dvmp.sh
index 5efb7ed34f9b1144900a3ca2600a8694eeb2e3a9..304e792c670d1413c7f5f19e261ba10b8c2791ca 100755
--- a/benchmarks/dvmp/dvmp.sh
+++ b/benchmarks/dvmp/dvmp.sh
@@ -90,11 +90,11 @@ for rec in options/*.py ; do
   [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
   JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
     gaudirun.py ${rec}
+  if [ "$?" -ne "0" ] ; then
+    echo "ERROR running juggler, both attempts failed"
+    exit 1
+  fi
 done
-if [ "$?" -ne "0" ] ; then
-  echo "ERROR running juggler, both attempts failed"
-  exit 1
-fi
 
 ## =============================================================================
 ## Step 4: Analysis
diff --git a/benchmarks/synchrotron/synchrotron.sh b/benchmarks/synchrotron/synchrotron.sh
index c80b72a0a72075831084fc933a714e286ef93a8b..9de437b839a313fa21dd5561cc52424f17763fe0 100644
--- a/benchmarks/synchrotron/synchrotron.sh
+++ b/benchmarks/synchrotron/synchrotron.sh
@@ -121,11 +121,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 
diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh
index cea2af3759f8fb13140b9453d1df85165fad34be..8382606f07a324ca51232f66ab6316adc0fd72f5 100644
--- a/benchmarks/u_omega/u_omega.sh
+++ b/benchmarks/u_omega/u_omega.sh
@@ -120,11 +120,11 @@ if [[ -n "${DO_REC}" || -n "${DO_ALL}" ]] ; then
     [[ $(basename ${rec} .py) =~ (.*)\.(.*) ]] && tag=".${BASH_REMATCH[2]}"
     JUGGLER_REC_FILE=${JUGGLER_REC_FILE/.root/${tag:-}.root} \
       gaudirun.py ${rec}
+    if [[ "$?" -ne "0" ]] ; then
+      echo "ERROR running juggler"
+      exit 1
+    fi
   done
-  if [[ "$?" -ne "0" ]] ; then
-    echo "ERROR running juggler"
-    exit 1
-  fi
 
   root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
   if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 
diff --git a/options/reconstruction.py b/options/reconstruction.py
index d32c20de8a402a5ac7ce1fa2ad910ece652ec84d..81be18392f378c182a435898d9f3820b72508c66 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -886,35 +886,35 @@ if 'acadia' in detector_version:
 incl_kin_electron = InclusiveKinematicsElectron("incl_kin_electron",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsElectron"
 )
 algorithms.append(incl_kin_electron)
 incl_kin_jb = InclusiveKinematicsJB("incl_kin_jb",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsJB"
 )
 algorithms.append(incl_kin_jb)
 incl_kin_da = InclusiveKinematicsDA("incl_kin_da",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsDA"
 )
 algorithms.append(incl_kin_da)
 incl_kin_sigma = InclusiveKinematicsSigma("incl_kin_sigma",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicsSigma"
 )
 algorithms.append(incl_kin_sigma)
 incl_kin_esigma = InclusiveKinematicseSigma("incl_kin_esigma",
         inputMCParticles="MCParticles",
         inputParticles="ReconstructedParticles",
-        inputAssociations = "ReconstructedParticlesAssoc"
+        inputAssociations = "ReconstructedParticlesAssoc",
         outputData="InclusiveKinematicseSigma"
 )
 algorithms.append(incl_kin_esigma)