Added some exceptions and deleted the unused User model