Fixed null prams not being allowed with a switch