Merge "Removing the potential null object access."