diff --git a/inc/indexer.php b/inc/indexer.php
index c90f2b179dd970fdcdbf94ea60f096182a9b8255..f7bc4a7c4b9530f58af2f1f1506cd447288a0c99 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -96,13 +96,15 @@ function idx_getPageWords($page){
     if ($conf['deaccent']) {
       $links = p_get_metadata($page,'relation references');
 
-      $tmp = join(' ',array_keys($links));                // make a single string
-      $tmp = strtr($tmp, ':', ' ');                       // replace namespace separator with a space
-      $link_tokens = array_unique(explode(' ', $tmp));    // break into tokens
-
-      foreach ($link_tokens as $link_token) {
-        if (isset($tokens[$link_token])) continue;
-        $tokens[$link_token] = 1;
+      if (!empty($links)) {
+        $tmp = join(' ',array_keys($links));                // make a single string
+        $tmp = strtr($tmp, ':', ' ');                       // replace namespace separator with a space
+        $link_tokens = array_unique(explode(' ', $tmp));    // break into tokens
+
+        foreach ($link_tokens as $link_token) {
+          if (isset($tokens[$link_token])) continue;
+          $tokens[$link_token] = 1;
+        }
       }
     }
 
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 12177406f39cee4edeee4ad926546b0e3267414c..a84d99a842d39a881d6529c110b28479d7c930fa 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -198,7 +198,7 @@ function metaUpdate(){
                     0,true);
 
     $meta = array();
-    if(count($info)){
+    if(!empty($info)){
         $meta['date']['created'] = $info[0][1];
         foreach($info as $item){
             if($item[4] != '*'){