Add additional null checks when building pserver objects from