fixed exception mapping