From 2a34539a486220fda25dcb25f76e8b0a5a499d2f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 1 Sep 2014 11:39:07 -0400
Subject: [PATCH] bug ajax.js responseHandler: cannot read property of null

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog  | 1 +
 js/ajax.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0332e75749..c77cb68bec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.2.9.0 (not yet released)
+- bug       ajax.js responseHandler: cannot read property of null
 
 4.2.8.0 (2014-08-31)
 - bug #4516 Odd export behavior
diff --git a/js/ajax.js b/js/ajax.js
index 08b3221af4..57daa9d20d 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -234,7 +234,7 @@ var AJAX = {
      * @return void
      */
     responseHandler: function (data) {
-        if (typeof data === 'undefined') {
+        if (typeof data === 'undefined' || data === null) {
             return;
         }
         if (data.success) {