Restructured exception handling for dispatcher lookup so that it no longer breaks exception handling everywhere else.