patched up DB return handling