Possibly fixing reported crash on invalid JSON from API
merged and resolved conflicts