Fix error recovering from DB corruption maker if main DB doesn't exist

Also add better logging