Add timeout parameter and handle this case in the client.