CLC-2169 Handle invalid JSON from Canvas
Merge pull request #1279 from ctweney/clc-2169

CLC-2169 Handle invalid JSON from Canvas