Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.473
diff -u -r1.473 comment.module
--- modules/comment/comment.module      10 Aug 2006 05:47:37 -0000      1.473
+++ modules/comment/comment.module      10 Aug 2006 14:17:43 -0000
@@ -493,6 +493,9 @@
   global $user;

   $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid));
+  if (empty($comment)) {
+    return drupal_not_found();
+  }
   $comment = drupal_unpack($comment);
   $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
   if (comment_access('edit', $comment)) {