Add checks for partial server history