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

CLC-2169 (QA) Handle invalid JSON from Canvas