Merge "Better handle error log and nullptr reference."
am: 8dbea71192

* commit '8dbea71192d0fd91f6a47150590e1045000344a8':
  Better handle error log and nullptr reference.