fixed incorrect null string validation (string pointer is validated for nullity instead)
fixed incorrect null string validation (string pointer is validated for nullity instead)

triffon/up-2014-15,triffon/up-2014-15,triffon/up-2014-15,triffon/up-2014-15