diff --git a/Changelog b/Changelog
index da08506ce..f79b431bc 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.3
     - BUGFIX: Fix encoding issue in command line parameters processing
+    - BUGFIX: Fix possible crash when changing the save path in addition dialog
 
 * Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
     - BUGFIX: Fix display of torrent content in addition dialog
diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp
index e400e4998..eada81c6b 100644
--- a/src/torrentadditiondlg.cpp
+++ b/src/torrentadditiondlg.cpp
@@ -120,9 +120,13 @@ void torrentAdditionDialog::saveSettings() {
 }
 
 void torrentAdditionDialog::renameTorrentNameInModel(QString file_path) {
+  file_path = file_path.trimmed();
+  if(file_path.isEmpty()) return;
   file_path = file_path.replace("\\", "/");
   // Rename in torrent files model too
-  PropListModel->setData(PropListModel->index(0, 0), file_path.split("/", QString::SkipEmptyParts).last());
+  QStringList parts = file_path.split("/", QString::SkipEmptyParts);
+  if(!parts.empty())
+    PropListModel->setData(PropListModel->index(0, 0), parts.last());
 }
 
 void torrentAdditionDialog::limitDialogWidth() {