Fix lint error and crash when DB is updated.