Handle exceptions correctly.
Fixing up mappings and admin