solution: better handling for invalid JSON (cherry picked from commit 1b6a995c4e746f0704643426fc20f7496fc09cef)