Add null check to solve svace issue (#362)