Fixed Null Exception Bug in v0.1.6