Added some exceptions