diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 63124acb2..4664990bf 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -403,9 +403,10 @@ void Playlist::SongSaveComplete(TagReaderReply *reply, const QPersistentModelInd
   if (reply->is_successful() && idx.isValid()) {
     if (reply->message().save_file_response().success()) {
       PlaylistItemPtr item = item_at(idx.row());
-      if (!item) return;
-      QFuture<void> future = item->BackgroundReload();
-      NewClosure(future, this, SLOT(ItemReloadComplete(QPersistentModelIndex)), idx);
+      if (item) {
+        QFuture<void> future = item->BackgroundReload();
+        NewClosure(future, this, SLOT(ItemReloadComplete(QPersistentModelIndex)), idx);
+      }
     }
     else {
       emit Error(tr("An error occurred writing metadata to '%1'").arg(QString::fromStdString(reply->request_message().save_file_request().filename())));