PIM-3363 : normalize exceptions