'change' restructured
'client' restructured to limit the try/catch scope