Better error handling
Turn on json-python-json until I fix it