Merge "Prevent crash when client.enabled isn't defined"