Merge "init: Fix potential null pointer issue"