diff --git a/macosx/InfoTrackersViewController.m b/macosx/InfoTrackersViewController.m
index fa6d35516..97ad3d12f 100644
--- a/macosx/InfoTrackersViewController.m
+++ b/macosx/InfoTrackersViewController.m
@@ -116,7 +116,7 @@
         
         [fTrackerTable setTrackers: fTrackers];
         
-        if ([NSApp isOnLionOrBetter] && [fTrackers isEqualToArray: oldTrackers])
+        if ([NSApp isOnLionOrBetter] && (oldTrackers && [fTrackers isEqualToArray: oldTrackers]))
             [fTrackerTable setNeedsDisplay: YES];
         else
             [fTrackerTable reloadData];
diff --git a/macosx/TrackerNode.m b/macosx/TrackerNode.m
index c0932fb68..0a84a9639 100644
--- a/macosx/TrackerNode.m
+++ b/macosx/TrackerNode.m
@@ -57,6 +57,9 @@
     if (![object isKindOfClass: [self class]])
         return NO;
     
+    if ([self torrent] != [object torrent])
+        return NO;
+    
     return [self tier] == [object tier] && [[self fullAnnounceAddress] isEqualToString: [object fullAnnounceAddress]];
 }