Really the best method is change to DCM/H2O or toluene/water, may be better as separation and work-up are easier. Good stirring and use tetra-n-butylammonium bromide as phase transfer catalyst. Sodium azide dissolved in water with catalyst keeping the pH around 9 should avoid any HN3 formation, halide in organic.
For work-up just separate organic, water wash if required and remove solvent. Or just do your next reaction in that solvent.