A null check was added in r20560 (July 2008) and should be present in
the 1.7 release.