Finished exception handling from mappers.
Minor fix to error logging