APIPP-2

added charset checking