CONN-610: fix for .get(0) issue.
Merge pull request #589 from msweaver/CONN-610

CONN-610: fix for .get(0) issue.