Fixed errors on Exception E's