Merge "Fixed deref of null object at error message"