fixed exceptions
fixed exceptions