Correcting ugly exc handling