2 files changed, 6 insertions, 1 deletions

diff --git a/experiment/executable/executable.py b/experiment/executable/executable.py
index 09b7370..b964699 100644
--- a/experiment/executable/executable.py
+++ b/experiment/executable/executable.py
@@ -72,3 +72,6 @@ class Executable(object):
         self.sp.wait()
         if self.sp.returncode != 0:
             print >>sys.stderr, "Non-zero return: %s %s" % (self.exec_file, " ".join(self.extra_args))
+            return 0
+        else:
+            return 1
diff --git a/experiment/experiment.py b/experiment/experiment.py
index f0c201d..8c88799 100644
--- a/experiment/experiment.py
+++ b/experiment/experiment.py
@@ -136,7 +136,9 @@ class Experiment(object):
             ret = False
 
         self.log("Waiting for program to finish...")
-        map(methodcaller('wait'), self.executables)
+        for e in self.executables:
+            if not e.wait():
+                ret = False
 
         # And it must be stopped here for the same reason
         if self.overhead_trace: