latest changes for exception handling