Exceptions fixed
Exceptions fixed