[PTFM-6945] Preserve exception class name