add: null-checks for associatedSwitch references