fix exc handling