More possible NUL character problems solved.