more fixes to exception handling