Provide more context if a client is passed