diff --git a/macosx/Controller.m b/macosx/Controller.m
index b6f7c3fe0..acc8f3544 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -194,14 +194,11 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     [fDisplayedTorrents release];
     
     [fBadger release];
-    if (fOverlayWindow)
-        [fOverlayWindow release];
+    [fOverlayWindow release];
     [fIPCController release];
     
-    if (fAutoImportedNames)
-        [fAutoImportedNames release];
-    if (fPendingTorrentDownloads)
-        [fPendingTorrentDownloads release];
+    [fAutoImportedNames release];
+    [fPendingTorrentDownloads release];
     
     tr_close(fLib);
     [super dealloc];
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index ecbd08c0e..f9b1f61fc 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -181,8 +181,9 @@
     {
         if ([self pointInIconRect: point])
             [[fTorrents objectAtIndex: row] revealData];
-        else
+        else if (![self pointInActionRect: point])
             [fController showInfo: nil];
+        else;
     }
     else;