fixed NPE at bundle stop