Removed some unnecessary throws.