fix: Ensure client logger is always wrapped in a safe logger. (#599)

fix: Ensure client logger is always wrapped in a safe logger. (#599) #1690