error handling in JSON convert
Merge branch 'beta'