Merge "Exit early if the we encounter a null reference." into gingerbread