1 files changed, 18 insertions, 15 deletions

diff --git a/src/client.cpp b/src/client.cpp
index ee301e9..b546deb 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -27,31 +27,34 @@ void Bu::Client::processInput()
 
         for(;;)
         {
-                nRead = pSocket->read( buf, nRead );
-                if( nRead < 0  )
+                try
                 {
-                        throw Bu::ConnectionException(
-                                excodeReadError,
-                                "Read error: %s",
-                                strerror( errno )
-                                );
+                        nRead = pSocket->read( buf, RBS );
+
+                        if( nRead == 0 )
+                        {
+                                break;
+                        }
+                        else
+                        {
+                                nTotal += nRead;
+                                sReadBuf.append( buf, nRead );
+                                if( !pSocket->canRead() )
+                                        break;
+                        }
                 }
-                else if( nRead == 0 )
+                catch( ConnectionException &e )
                 {
+                        pSocket->close();
+                        bWantsDisconnect = true;
                         break;
                 }
-                else
-                {
-                        nTotal += nRead;
-                        sReadBuf.append( buf, nRead );
-                        if( !pSocket->canRead() )
-                                break;
-                }
         }
 
         if( nTotal == 0 )
         {
                 pSocket->close();
+                bWantsDisconnect = true;
         }
 
         if( pProto && nTotal )