diff --git a/sites/all/modules/contrib/i18n/i18nstrings/i18nstrings.module b/sites/all/modules/contrib/i18n/i18nstrings/i18nstrings.module
index 71f7f20..b4cac20 100644
--- a/sites/all/modules/contrib/i18n/i18nstrings/i18nstrings.module
+++ b/sites/all/modules/contrib/i18n/i18nstrings/i18nstrings.module
@@ -917,7 +917,8 @@ function i18nstrings_cache($context, $langcode, $string = NULL, $translation = N
     $search = &$strings[$langcode];
     $default = NULL;
     $list = array('textgroup', 'type', 'objectid', 'property');
-    while (($field = array_shift($list)) && !empty($context->$field)) {
+    while (($field = array_shift($list)) &&
+           (isset($context->$field) && trim($context->$field) != '')) {
       if (isset($search[$context->$field])) {
         $search = &$search[$context->$field];
         if (isset($search['#default'])) {