Added preparations for exceptions