Fix handling of multiple enables/disables
More null checking