Reworked mapper a bit
Added exceptions to check for errors instead of triggering events