diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index bd80f192d..ebc627454 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -692,7 +692,7 @@ void bittorrent::saveFastResumeAndRatioData(){
   if(! torrentBackup.exists()){
     torrentBackup.mkpath(torrentBackup.path());
   }
-  // Write fast resume data
+  // Pause torrents
   std::vector<torrent_handle> handles = s->get_torrents();
   for(unsigned int i=0; i<handles.size(); ++i){
     torrent_handle &h = handles[i];
@@ -702,11 +702,19 @@ void bittorrent::saveFastResumeAndRatioData(){
     }
     // Pause download (needed before fast resume writing)
     h.pause();
+  }
+  // Write fast resume data
+  for(unsigned int i=0; i<handles.size(); ++i){
+    torrent_handle &h = handles[i];
+    if(!h.is_valid()){
+      qDebug("/!\\ Error: Invalid handle");
+      continue;
+    }
     QString fileHash = QString(misc::toString(h.info_hash()).c_str());
     while(!receivedPausedAlert(fileHash)){
       //qDebug("Sleeping while waiting that %s is paused", misc::toString(h.info_hash()).c_str());
       //printPausedTorrents();
-      SleeperThread::msleep(500);
+      SleeperThread::msleep(300);
       readAlerts();
     }
     // Extracting resume data
@@ -1042,7 +1050,7 @@ void bittorrent::reloadTorrent(const torrent_handle &h){
   }
   // Write fast resume data
   // Torrent is already paused
-  Q_ASSERT(pausedTorrents.indexOf(fileHash) != 1);
+  Q_ASSERT(pausedTorrents.indexOf(fileHash) != -1);
   // Extracting resume data
   if (h.has_metadata()){
     // get fast resume data
diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp
index 6fa5f362d..2b20c6564 100644
--- a/src/properties_imp.cpp
+++ b/src/properties_imp.cpp
@@ -365,17 +365,21 @@ void properties::deleteSelectedUrlSeeds(){
   QList<QListWidgetItem *> selectedItems;
   selectedItems = listWebSeeds->selectedItems();
   QListWidgetItem *item;
+  bool change = false;
   foreach(item, selectedItems){
     QString url_seed = item->text();
     int index = urlSeeds.indexOf(url_seed);
     Q_ASSERT(index != -1);
     urlSeeds.removeAt(index);
     h.remove_url_seed(misc::toString((const char*)url_seed.toUtf8()));
+    change = true;
+  }
+  if(change){
+    // Save them to disk
+    saveWebSeeds();
+    // Refresh list
+    loadWebSeeds();
   }
-  // Save them to disk
-  saveWebSeeds();
-  // Refresh list
-  loadWebSeeds();
 }
 
 void properties::deleteSelectedTrackers(){