CONN-896: fix for problem found in qa.
Merge pull request #702 from msweaver/CONN-896

CONN-896: fix for problem found in qa.