Vinay | Hack to ensure we work fine when DB does not exist