CONN-376: fix for issue identified in QA.
Merge pull request #491 from msweaver/CONN-376

CONN-376: fix for issue identified in QA.