Fixed NPE on disable