Merge "hal: fix crash due to null pointer deference"