diff --git a/token.tokens.inc b/token.tokens.inc
index f584bda..64bfd60 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -420,7 +420,9 @@ function token_tokens($type, $tokens, array $data = array(), array $options = ar
           }
           break;
         case 'log':
-          $replacements[$original] = $sanitize ? filter_xss($node->log) : $node->log;
+          // $node->log is not always set and check if it exists or not.
+          $log = !empty($node->log) ? $node->log : '';
+          $replacements[$original] = $sanitize ? filter_xss($log) : $log;
           break;
         case 'content-type':
           $type_name = node_type_get_name($node);