CONN-443: Fix for issue found in QA.
Merge pull request #488 from msweaver/CONN-443

CONN-443: Fix for issue found in QA.