I improved handling exceptions.