Fixed leak test
Fixed bug 960216
Handle stupid non-unicode things if they should occur...