- changed exception handling