diff --git a/src/main/java/listfix/model/playlists/Playlist.java b/src/main/java/listfix/model/playlists/Playlist.java
index 4be3843b..af4242f7 100644
--- a/src/main/java/listfix/model/playlists/Playlist.java
+++ b/src/main/java/listfix/model/playlists/Playlist.java
@@ -479,7 +479,7 @@ public void play()
     }
     catch (IOException e)
     {
-      _logger.warn(String.format("Launching file: %s", this.playlistPath), e);
+      _logger.warn(String.format("Failed to launching file: %s", this.playlistPath), e);
     }
   }
 
diff --git a/src/main/java/listfix/view/controls/PlaylistEditCtrl.java b/src/main/java/listfix/view/controls/PlaylistEditCtrl.java
index ce896a6b..d0ab4388 100644
--- a/src/main/java/listfix/view/controls/PlaylistEditCtrl.java
+++ b/src/main/java/listfix/view/controls/PlaylistEditCtrl.java
@@ -584,7 +584,15 @@ private void playSelectedEntries()
     List<PlaylistEntry> playlistEntries = this.getSelectedPlaylistEntries().stream()
       .filter(entry -> entry.isFound() || entry.isURL())
       .collect(Collectors.toList());
+    this.playEntries(playlistEntries);
+  }
+  private void playAllEntries()
+  {
+    this.playEntries(this.playlist.getEntries());
+  }
 
+  private void playEntries(final List<PlaylistEntry> playlistEntries)
+  {
     try
     {
       // Get a temp playlist
@@ -809,14 +817,14 @@ private void onBtnPlayActionPerformed(ActionEvent evt)
     }
     else
     {
-      if (playlist.isModified())
+      if (this.playlist.isModified())
       {
         // this plays all entries if nothing is selected, and plays what the user has in memory
-        playSelectedEntries();
+        this.playAllEntries();
       }
       else
       {
-        playlist.play();
+        this.playlist.play();
       }
     }
   }