diff --git a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
index 5b83c65..8fadd68 100644
--- a/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
+++ b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/Fdaq.java
@@ -47,7 +47,7 @@ public class Fdaq {
 	private final EventBus bus;
 	
 	private FdaqConfiguration configuration;
-	private final int numberOfElements = Integer.MAX_VALUE/2;
+	private final int numberOfElements = Integer.MAX_VALUE/2;        
 	
 	public Fdaq(EventBus bus, FdaqConfiguration configuration){
 		this.bus = bus;
@@ -150,8 +150,11 @@ public class Fdaq {
 				}
 			} finally {
 				try {
+                                    if (out!=null)
 					out.close();
+                                    if (in!=null)
 					in.close();
+                                    if (echoSocket!=null)
 					echoSocket.close();
 				} catch (IOException e) {
 					// Ignore because not relevant at this stage