Issue #305

Could we run into issues here where json is undefined?