Fixed some nasty bugs in Exception handler. Reactivated.