db: handle conditional returns better