Fix possible NPE with last fix for #835Signed-off-by: Ross Allan <[email protected]> (commit: 5f59f75)