exceptions updated
finally merged!!!11111111