More defensive-coding fixes from James H.