POPS-245 / POPS-263 / POPS-264 - Customer error handling