Merge "Add in missing NULL pointer checks."