Merge pull request #289 from Dmitry-Me/fixNullPointerDereference

Fix null pointer dereference planted in PR287 and reported in PR288