Began fixing up throw statements.