added exceotions to prevent failure because of one