Merge "Better handle error log and nullptr reference."