am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.