Faults in exceptions fixed