Fix for No DB Use Case

Fixes issue: shippable/pm#786