fix: Ensure client logger is always wrapped in a safe logger.

fix: Ensure client logger is always wrapped in a safe logger. #1800