Bug on exceptions fixed