SLICE-39 NPE prevention + doc updated