Remove the close_client_connection
Make handling of closed connections more safe