FYI,

I committed the attached as pretty obvious.  It should stop the panics 
that nickk reported (thanks!).

(Nick, btw, I can count :-)

Andrew