Updating to commit 15eb
Basically adds to safety measures against null pointers.