Merge commit 'c6fb7a5e' into gingerbread-plus-aosp * commit 'c6fb7a5e': Exit early if the we encounter a null reference.