CONN-377: fix for issue found in QA.
Merge pull request #496 from msweaver/CONN-377

CONN-377: fix for issue found in QA.