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

* commit 'a5ca229a4571f6df42c96e760257b7ca95c7fdeb':
  init: Fix potential null pointer issue