Stupid bug requires easy fix!
Merge branch 'hotfix/json_excption'