Fixed a segfault.  Experiencing another one.