Modified json parser to fix a null string issue