Removed some unnecessary exception naming; thanks claudep.