--- realname.module.orig	2009-01-06 12:47:04.000000000 +0100
+++ realname.module	2009-01-07 12:38:40.000000000 +0100
@@ -144,7 +144,9 @@ function realname_nodeapi(&$node, $op, $
       }
       $account = $accounts[$node->uid];
       $node->realname = $node->name = realname_make_name($account);
-      $node->homepage = $account->homepage;
+      if (isset($account->homepage)) {
+        $node->homepage = $account->homepage;
+      }
       break;
 
     case 'prepare':
@@ -166,7 +168,9 @@ function realname_comment(&$comment, $op
       if (!$comment->homepage) {
         $account = user_load(array('uid' => $comment->uid));
         realname_make_name($account);
-        $comment->homepage = $account->homepage;
+        if (isset($account->homepage)) {
+          $comment->homepage = $account->homepage;
+        }
       }
       break;
   }
@@ -266,7 +270,9 @@ function realname_make_name(&$account) {
   static $edit = array();
 
   if (isset($users[$account->uid])) {
-    $account->homepage = $links[$account->uid];
+    if (isset($links[$account->uid])) {
+      $account->homepage = $links[$account->uid];
+    }
     return $users[$account->uid];
   }
 
--- realname_theme.inc.orig	2009-01-06 12:47:10.000000000 +0100
+++ realname_theme.inc	2009-01-06 12:56:55.000000000 +0100
@@ -19,7 +19,7 @@
  */
 function phptemplate_username($object) {
   // If we have a user id but no realname, then make one.
-  if ($object->uid && !$object->realname && user_access('use realname')) {
+  if ($object->uid && empty($object->realname) && user_access('use realname')) {
     $object->realname = realname_make_name($object);
   }
 
--- token_realname.inc.orig	2009-01-06 12:59:36.000000000 +0100
+++ token_realname.inc	2009-01-06 13:00:34.000000000 +0100
@@ -34,7 +34,10 @@ function realname_token_values($type, $o
     case 'comment':
       $tokens['realname'] = realname_make_name($object);
       $tokens['realname-link'] = theme('username', $object);
-      $tokens['homepage'] = $object->homepage;
+      $tokens['homepage'] = '';
+      if (isset($object->homepage)) {
+        $tokens['homepage'] = $object->homepage;
+      }
       return $tokens;
       
   }