A few modifications to try to eliminate the segfault.
Authored by: bugman 2006-03-14
Parent: [r2386]
Child: [r2388]
