Fixed server recovery NPEs