Fix: null object causes crash
Merge pull request #11 from infosia/fix_obj_null

Fix: null object causes crash