Remove unnecessary throws.  Make sure to squash this commit.