took out exception swallowing