diff --git a/darkice/branches/darkice-aacp/src/TcpSocket.cpp b/darkice/branches/darkice-aacp/src/TcpSocket.cpp
index 745d08b..28046f4 100644
--- a/darkice/branches/darkice-aacp/src/TcpSocket.cpp
+++ b/darkice/branches/darkice-aacp/src/TcpSocket.cpp
@@ -215,12 +215,14 @@ TcpSocket :: open ( void )                       throw ( Exception )
     snprintf(portstr, sizeof(portstr), "%d", port);
 
     if (getaddrinfo(host , portstr, &hints, &ptr)) {
+        sockfd = 0;
         throw Exception( __FILE__, __LINE__, "getaddrinfo error", errno);
     }
     memcpy ( addr, ptr->ai_addr, ptr->ai_addrlen);
     freeaddrinfo(ptr);
 #else
     if ( !(pHostEntry = gethostbyname( host)) ) {
+        sockfd = 0;
         throw Exception( __FILE__, __LINE__, "gethostbyname error", errno);
     }
     
@@ -231,6 +233,7 @@ TcpSocket :: open ( void )                       throw ( Exception )
 #endif
 
     if ( (sockfd = socket( AF_INET, SOCK_STREAM,  IPPROTO_TCP)) == -1 ) {
+        sockfd = 0;
         throw Exception( __FILE__, __LINE__, "socket error", errno);
     }
 
@@ -281,6 +284,8 @@ TcpSocket :: canRead (      unsigned int    sec,
     ret = pselect( sockfd + 1, &fdset, NULL, NULL, &timespec, &sigset);
 
     if ( ret == -1 ) {
+        ::close( sockfd);
+        sockfd = 0;
         throw Exception( __FILE__, __LINE__, "select error");
     }
 
@@ -313,7 +318,9 @@ TcpSocket :: read (     void          * buf,
                 break;
 
             default:
-                throw Exception( __FILE__, __LINE__, "recv error", errno);
+		::close( sockfd);
+		sockfd = 0;
+		throw Exception( __FILE__, __LINE__, "recv error", errno);
         }
     }
 
@@ -350,6 +357,8 @@ TcpSocket :: canWrite (    unsigned int    sec,
     ret = pselect( sockfd + 1, NULL, &fdset, NULL, &timespec, &sigset);
     
     if ( ret == -1 ) {
+	::close( sockfd);
+	sockfd = 0;
         throw Exception( __FILE__, __LINE__, "select error");
     }
 
@@ -380,6 +389,8 @@ TcpSocket :: write (    const void    * buf,
         if ( errno == EAGAIN ) {
             ret = 0;
         } else {
+	    ::close( sockfd);
+	    sockfd = 0;
             throw Exception( __FILE__, __LINE__, "send error", errno);
         }
     }
diff --git a/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp b/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
index 7118865..9b71ccb 100644
--- a/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
+++ b/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
@@ -78,7 +78,17 @@ aacPlusEncoder :: open ( void )
 
     reportEvent(1, "Using aacplus codec version", "720 3gpp");
     
-    
+    bitrate = getOutBitrate() * 1000;
+    bandwidth = 0;
+    useParametricStereo = 0;
+    numAncDataBytes=0;
+    coreWriteOffset = 0;
+    envReadOffset = 0;
+    writeOffset = INPUT_DELAY*MAX_CHANNELS;
+    writtenSamples = 0;
+    aacEnc = NULL;
+    hEnvEnc=NULL;
+
     /* set up basic parameters for aacPlus codec */
     AacInitDefaultConfig(&config);
     nChannelsAAC = nChannelsSBR = getOutChannel();