Fix previous exceptions