CONN-892: fix for error found while QAing.
Merge pull request #707 from msweaver/CONN-892

CONN-892: fix for error found while QAing.