Handle nil pointer#1036

RRashmit wants to merge 1 commit intomainnginx/agent:mainfrom

fix-nil-pointernginx/agent:fix-nil-pointerCopy head branch name to clipboard