Fixed possible NPEs on disable.