am 1615c09a: Merge "init: Fix potential null pointer issue"

* commit '1615c09ac1065104f56ddc444f5467aff76c0daa':
  init: Fix potential null pointer issue