Removed some paranoid exceptions