Fix nil manufacturer error during switch-to functions.