Fixed bug introduced in returing strings, when added character sets.
Also added new better error reporting.
Authored by: dwarren 2014-06-11
Parent: [r7973]
Child: [r7975]