Finally fixed NPE on disabling.