fixing watch serial with missing pnpId