Tweaked init in order to remove old exception handler