[TS-3112] : Add another null check per James Peach's code review
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver