Deal with a nil pointer
Merge pull request #823 from control-center/feature/fixnpe

Deal with a nil pointer