- Really fix database upgrade crash