[PAXEXAM-631] simplified exception handling