Fixed some exceptions fails