Archer bump, removed unnecessary throws. Relates to #1.