Exceptions fixed