Rearranges pz2/sp client logic to isolate error messaging