removed code dealing with exceptions