diff --git a/Changelog b/Changelog
index 3bca631cf..f3d7ea8bd 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.1
+    - BUGFIX: Fix possible crash when right-clicking on a torrent
+
 * Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
     - FEATURE: qBittorrent can now act as a tracker
     - FEATURE: New and improved RSS feed automated downloader
diff --git a/src/qtlibtorrent/qtorrenthandle.cpp b/src/qtlibtorrent/qtorrenthandle.cpp
index 62fa06673..d340f5c88 100644
--- a/src/qtlibtorrent/qtorrenthandle.cpp
+++ b/src/qtlibtorrent/qtorrenthandle.cpp
@@ -132,6 +132,7 @@ bool QTorrentHandle::first_last_piece_first() const {
     }
     ++index;
   }
+  if(index >= torrent_handle::get_torrent_info().num_files()) return false;
   file_entry media_file = torrent_handle::get_torrent_info().file_at(index);
   int piece_size = torrent_handle::get_torrent_info().piece_length();
   Q_ASSERT(piece_size>0);