added excpetions
fix