added db checks to other methods