diff --git a/ChangeLog b/ChangeLog
index ba2731a80..52346b0e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
 Deluge 0.9.07 - "1.0.0_RC7" (In Development)
  Core:
-  * Fix Vista slowness issue
+  * Fix loading torrents from state when fastresume file is missing
+
  GtkUI:
   * Add 'edit' to edit trackers dialog
   * Improve performance of initial torrent list load
   * Fix hiding the bottom pane when disabling all the tabs
+ 
+ Windows:
+  * Fix Vista slowness issue
   
 Deluge 0.9.06 - "1.0.0_RC6" (13 August 2008)
  Core:
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 478396206..5462213a7 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -217,7 +217,7 @@ class TorrentManager(component.Component):
     
     def get_resume_data_from_file(self, torrent_id):
         """Returns an entry with the resume data or None"""
-        fastresume = None
+        fastresume = ""
         try:
             _file = open(
                 os.path.join(