Fix NPE on stop