(PE-2227) Better service exceptions