added extra exceptions