fix NPE on reload