Adapting the return values for errors management in the client