added try catch to stringify
Merge remote-tracking branch 'origin/master'