Rod, if you're around, can you fix those tests I just broke with the extra null check? If not, I'll get to it this afternoon. -- Scott