Fixed work with execptions