Fix a few places where a null pointer may be dereferenced#1470

Merged

smowton merged 1 commit intodiffblue:developfrom

reuk:reuk/fix-null-dereferences

Oct 11, 2017

Commits on Oct 11, 2017

Fix a couple of places where a null pointer may be dereferenced
reuk
committed