Merge "hal: fix null pointer de-reference"