Fix to DB Drop Error

Fixes issue: Shippable/pm#786