water in A.I.R. pump

i have a 2000 GMC Jimmy, the check engine light has came on twice in a week. we took it to the dealer and they replaced the A.I.R. pump twice saying it had water in it. the second time they also replaced the check vavles to it, but said they weren't sure if this would fix it. there is a technical bulliten from GM about this problem. has anyone else had this problem. any recommndations?

There was a PI bulletin on that issue...To prevent water from entering the AIR pump, you need to extend the intake hose over the PCM to the cowl.