[#11] properly mapping exceptions