Adding waiting client send and error response code