Merge "NPE in database corruption handler if attached database list is null"