Fix null pointer on fresh install