(Hopefully) fixes GH-114 - Null Pointer Exception

Signed-off-by: Ian Lake <ian.hannibal.lake@gmail.com>