Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/js/console.js b/js/console.js
index a73525b045..4a0f206cf8 100644
--- a/js/console.js
+++ b/js/console.js
@@ -167,8 +167,12 @@ var PMA_console = {
             });
 
             $(document).ajaxComplete(function (event, xhr) {
-                var data = $.parseJSON(xhr.responseText);
-                PMA_console.ajaxCallback(data);
+                try {
+                    var data = $.parseJSON(xhr.responseText);
+                    PMA_console.ajaxCallback(data);
+                } catch (e) {
+                    console.log("Invalid JSON!" + e.message);
+                }
             });
 
             PMA_console.isInitialized = true;