Removed a couple of clang-reported potential dereferences of null/undefined pointers.