Reworked some exception mappings in portal.