Merge "Don't null class member before using it." into klp-modular-dev