xpdr error checking improvements