Index: modules/tracker/tracker.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v
retrieving revision 1.32
diff -u -p -r1.32 tracker.pages.inc
--- modules/tracker/tracker.pages.inc	30 Jul 2010 02:47:28 -0000	1.32
+++ modules/tracker/tracker.pages.inc	10 Feb 2011 22:37:52 -0000
@@ -12,7 +12,7 @@
  */
 function tracker_page($account = NULL, $set_title = FALSE) {
   if ($account) {
-    $query = db_select('tracker_user', 't')->extend('PagerDefault');
+    $query = db_select('tracker_user', 't', array('target' => 'slave'))->extend('PagerDefault');
     $query->condition('t.uid', $account->uid);
 
     if ($set_title) {
@@ -48,6 +48,12 @@ function tracker_page($account = NULL, $
 
     // Finally display the data
     foreach ($nodes as $node) {
+      // Don't try to generate entries for any placeholder nodes that didn't
+      // get filled in, whatever the cause may be.
+      if (!isset($node->type)) {
+        continue;
+      }
+
       // Determine the number of comments:
       $comments = 0;
       if ($node->comment_count) {