diff --git a/ChangeLog b/ChangeLog
index 8552c5af..0cd91790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ Paul Davis
 2009-10-25 Stephane Letz  <letz@grame.fr>
 
 	* Improve aggregate device management in JackCoreAudioDriver : now a "private" device only and cleanup properly.
+	* Aggregate device code added to JackCoreAudioAdapter.
 
 2009-10-23 Stephane Letz  <letz@grame.fr>
 
diff --git a/posix/JackSocketServerChannel.cpp b/posix/JackSocketServerChannel.cpp
index cacaef3d..eb988aef 100644
--- a/posix/JackSocketServerChannel.cpp
+++ b/posix/JackSocketServerChannel.cpp
@@ -60,10 +60,6 @@ int JackSocketServerChannel::Open(const char* server_name, JackServer* server)
     BuildPoolTable();
     fServer = server;
     return 0;
-
-error:
-    fRequestListenSocket.Close();
-    return -1;
 }
 
 void JackSocketServerChannel::Close()