Fix potential null pointer reference, release 0.1.4