Handle when p and s switch, modified error messages