[Nsi-wg] Error handling update