diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 027e070..af3ac84 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2734,7 +2734,9 @@ function language_name($langcode) {
   if ($language = language_load($langcode)) {
     return $language->name;
   }
-
+  if (empty($langcode)) {
+    return t('Unknown');
+  }
   return t('Unknown (@langcode)', array('@langcode' => $langcode));
 }
 
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 9578417..32cade3 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -104,7 +104,7 @@ function node_filters() {
     ) + node_type_get_names(),
   );
 
-  // Language filter if the site is multilingual.
+  // Language filter if language support is present.
   if (language_multilingual()) {
     $languages = language_list(TRUE);
     $language_options = array(LANGUAGE_NONE => t('- None -'));
@@ -433,9 +433,8 @@ function node_admin_nodes() {
     '#submit' => array('node_admin_nodes_submit'),
   );
 
-  // Enable language column if translation module is enabled or if we have any
-  // node with language.
-  $multilanguage = (module_exists('translation') || db_query_range("SELECT 1 FROM {node} WHERE langcode <> :langcode", 0, 1, array(':langcode' => LANGUAGE_NONE))->fetchField());
+  // Enable language column and filter if multiple languages are enabled.
+  $multilingual = language_multilingual();
 
   // Build the sortable table header.
   $header = array(
@@ -445,7 +444,7 @@ function node_admin_nodes() {
     'status' => array('data' => t('Status'), 'field' => 'n.status'),
     'changed' => array('data' => t('Updated'), 'field' => 'n.changed', 'sort' => 'desc')
   );
-  if ($multilanguage) {
+  if ($multilingual) {
     $header['language_name'] = array('data' => t('Language'), 'field' => 'n.langcode');
   }
   $header['operations'] = array('data' => t('Operations'));
@@ -497,7 +496,7 @@ function node_admin_nodes() {
       'status' => $node->status ? t('published') : t('not published'),
       'changed' => format_date($node->changed, 'short'),
     );
-    if ($multilanguage) {
+    if ($multilingual) {
       $options[$node->nid]['language_name'] = language_name($node->langcode);
     }
     // Build a list of all the accessible operations for the current node.