Clean up error mapping

Authored by melvo on Feb 12 2020, 1:50 PM.