Avoid some NRE's in the logs.
Merge pull request #694 from godarklight/avoid-nres

Avoid some NRE's in the logs.