Minor updates, yep, still NPE

Signed-off-by: joshpine <josh@digitalcake.co.nz>