Improved switch error calculations