fixed NPEs on disable