diff --git a/src/ensemble/ensemble.py b/src/ensemble/ensemble.py
index f021336..4c07f56 100644
--- a/src/ensemble/ensemble.py
+++ b/src/ensemble/ensemble.py
@@ -417,11 +417,6 @@ def run_on_HPC(self, enX, batch_size=None, **kwargs):
                 else:
                     en_pred.append(False)
                 self.sim.remove_folder(member_i)
-
-            # Store partial batch results if needed
-            part_pred_data = dtools.en_pred_to_pred_data(en_pred)
-            if 'save_prediction' in kwargs and kwargs['save_prediction']:
-                np.savez(kwargs['save_prediction'] +'.npz', **{'pred_data': part_pred_data})
         
         return en_pred
 
diff --git a/src/popt/loop/ensemble_base.py b/src/popt/loop/ensemble_base.py
index 3415b4b..f2999e2 100644
--- a/src/popt/loop/ensemble_base.py
+++ b/src/popt/loop/ensemble_base.py
@@ -139,7 +139,7 @@ def function(self, x, *args, **kwargs):
         else:
             func_values = np.inf  # the simulations have crashed
 
-        if len(x.shape) == 1 and func_values != np.inf:
+        if len(x.shape) == 1 and np.all(func_values != np.inf):
             self.stateF = func_values
         else:
             self.enF = func_values