v0.02 Minor Tweaks

Just a bit of minor tweaks and null checks added.