Fix for null pointers after update
Release commit
Null detection to avoid unhandeled exception
Make sure to re-create since boot ref at first start