Some changes for exceptions