correctly handle pre-existing cases with no ServerBase