exceptions workflow improved