Fix for xpd doc error reporting issues