minor fixes

mapper exceptions