Add additional db check