Squash some more potential null pointer dereferences
Merge pull request #982 from lioncash/deref

Squash some more potential null pointer dereferences