diff --git a/html/user/forum_forum.php b/html/user/forum_forum.php
index e6519d6f84..02674b89e9 100644
--- a/html/user/forum_forum.php
+++ b/html/user/forum_forum.php
@@ -161,6 +161,7 @@ function show_forum($forum, $start, $sort_style, $user) {
     $n = 0; $i=0;
     foreach ($threads as $thread) {
         $owner = BoincUser::lookup_id($thread->owner);
+        if (!$owner) continue;
         $unread = thread_is_unread($user, $thread);
 
         //if ($thread->status==1){
diff --git a/html/user/forum_thread.php b/html/user/forum_thread.php
index f02b98a55e..9fe2785cc9 100644
--- a/html/user/forum_thread.php
+++ b/html/user/forum_thread.php
@@ -181,7 +181,7 @@ if ($is_subscribed) {
     );
 }
 
-//If the logged in user is moderator enable some extra features
+// If the logged in user is moderator enable some extra features
 //
 if (is_moderator($logged_in_user, $forum)) {
     if ($thread->hidden){
@@ -264,6 +264,7 @@ if (is_news_forum($forum) && $logged_in_user && ($logged_in_user->id == $thread-
 }
 
 // Display a box that allows the user to select sorting of the posts
+//
 echo "</td><td align=\"right\">
     <input type=\"hidden\" name=\"id\" value=\"", $thread->id, "\">" .
     tra("Sort");