Added minor error handling to json_generator.
Merge branch 'Test' into fileLoad