diff --git a/source/net/filebot/ui/rename/EpisodeListMatcher.java b/source/net/filebot/ui/rename/EpisodeListMatcher.java
index 7009f0ac..fd937e9a 100644
--- a/source/net/filebot/ui/rename/EpisodeListMatcher.java
+++ b/source/net/filebot/ui/rename/EpisodeListMatcher.java
@@ -111,7 +111,7 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
 				prefs.put("dialog.select.h", Integer.toString(selectDialog.getHeight()));
 
 				if (selectDialog.getSelectedAction() == null) {
-					throw new CancellationException("Cancelled by user");
+					throw new CancellationException();
 				}
 
 				// remember if we should auto-repeat the chosen action in the future
diff --git a/source/net/filebot/ui/rename/MovieHashMatcher.java b/source/net/filebot/ui/rename/MovieHashMatcher.java
index e0eac123..ca179f4f 100644
--- a/source/net/filebot/ui/rename/MovieHashMatcher.java
+++ b/source/net/filebot/ui/rename/MovieHashMatcher.java
@@ -427,7 +427,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
 				}
 
 				if (selectDialog.getSelectedAction() == null) {
-					throw new CancellationException("Cancelled by user");
+					throw new CancellationException();
 				}
 
 				// selected value or null if the dialog was canceled by the user
diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
index 35ddf189..e7617849 100644
--- a/source/net/filebot/ui/rename/RenamePanel.java
+++ b/source/net/filebot/ui/rename/RenamePanel.java
@@ -888,9 +888,7 @@ public class RenamePanel extends JComponent {
 						// add remaining file entries
 						renameModel.files().addAll(remainingFiles);
 					} catch (Exception e) {
-						if (findCause(e, CancellationException.class) != null) {
-							debug.log(Level.WARNING, getRootCause(e).toString());
-						} else {
+						if (findCause(e, CancellationException.class) == null) {
 							log.log(Level.WARNING, String.format("%s: %s", getRootCause(e).getClass().getSimpleName(), getRootCauseMessage(e)), e);
 						}
 					} finally {