Corrected issue where not receiving a response killed the client