Add check for nil DefaultClient