Add "override" table, catch some extra exceptions