HCOLL-99 improved exception handling