Merge pull request #148 from drpebcak/COOK-3900

Fixes for #142 and #146
changing exists to exist, attempted fix for #149