removed unnecessary exceptions, exceptions should be reclassified later.