Removed some exceptions