Added exceptions to mapper