diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java
index 4baefab..40b575f 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/core/loops/cr/ParallelCrlogic.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import ch.psi.fda.core.Action;
@@ -149,7 +150,7 @@ public class ParallelCrlogic implements ActionLoop {
 				
 				// Execute the logic of this path
 				scrlogic.execute();
-						return true;
+				return true;
 			}});
 		list.add(f);
 		
@@ -171,8 +172,7 @@ public class ParallelCrlogic implements ActionLoop {
 			try {
 				bf.get();
 			} catch (ExecutionException e) {
-				// TODO Handle exception the correct way
-				e.printStackTrace();
+				logger.log(Level.WARNING, "Something went wrong while waiting for crthreads to finish", e);
 			}
 		}