Guarantee session is closed when saving draft and claim