DISPATCH-1387 - Additional fix. Fix null pointer dereference problems. This closes #563.
3 files changed