Fix issue 154

Resolves the crashes reported by Chris Dragon and Rick Bolen on the mailing list.