Some updates to exception handling and no route handling.