BS-5941
fix npe in content assist