diff --git a/ChangeLog b/ChangeLog
index b238ed15b5..4ceb322f0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug       Undefined constant PMA_DRIZZLE
 - bug #4712 Wrongly positioned date-picker while Grid-Editing
 - bug #4714 Forced ORDER BY for own sql statements
+- bug #4721 Undefined property: stdClass::$version
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 60a50c5dea..4560ceffdc 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4258,8 +4258,8 @@ class PMA_Util
 
         $data = json_decode($response);
         if (is_object($data)
-            && /*overload*/mb_strlen($data->version)
-            && /*overload*/mb_strlen($data->date)
+            && ! empty($data->version)
+            && ! empty($data->date)
             && $save
         ) {
             if (! isset($_SESSION) && ! defined('TESTSUITE')) {
diff --git a/version_check.php b/version_check.php
index fda43ad2f0..352b6f00ce 100644
--- a/version_check.php
+++ b/version_check.php
@@ -18,8 +18,8 @@ $version = PMA_Util::getLatestVersion();
 
 echo json_encode(
     array(
-        'version' => $version->version,
-        'date' => $version->date,
+        'version' => (! empty($version->version) ? $version->version : ''),
+        'date' => (! empty($version->date) ? $version->date : ''),
     )
 );