client instance was changed to an Option of a client