Check for null pointer dereference

Check for null pointer dereference #66