Fixed handling non-ascii characters
Fixed handling empty dictionary entries (as occurs in web streams i.e.)