Add safe notify