Catch null results in json-rpc apis

Michal Zanderrequested to merge
mzander/workaround-for-null into develop

Merge request reports