- exception handling improved