Fixing NPE on clean restart