HCOLL-167 fixed an issue with the  remove(null) not throwing NPE