diff --git delicious.module delicious.module
index ee1f2ec..530f12c 100644
--- delicious.module
+++ delicious.module
@@ -213,9 +213,13 @@ function delicious_nodeapi(&$node, $op, $arg = 0) {
         if (!$uname) {
           $uname = db_result(db_query("SELECT user FROM {delicious_user} WHERE uid = %d", $node->uid));
         }
-        if ($uname) {  
-          $node->body = _delicious_tag_text($node->body, $uname); 
-          $node->teaser = _delicious_tag_text($node->teaser, $uname);
+        if ($uname) {
+          if (!empty($node->body)) {
+            $node->body = _delicious_tag_text($node->body, $uname);
+          }
+          if (!empty($node->teaser)) {
+            $node->teaser = _delicious_tag_text($node->teaser, $uname);
+          }
         }
       }
       break;