Fix database failure disabling?