Fix possible NPE with last fix for #835

Signed-off-by: Ross Allan <rallanpcl@gmail.com>