diff --git a/source/net/filebot/ui/rename/RenameAction.java b/source/net/filebot/ui/rename/RenameAction.java
index d2ce44a4..3f6b9635 100644
--- a/source/net/filebot/ui/rename/RenameAction.java
+++ b/source/net/filebot/ui/rename/RenameAction.java
@@ -75,14 +75,14 @@ class RenameAction extends AbstractAction {
 
 	@Override
 	public void actionPerformed(ActionEvent evt) {
+		if (model.names().isEmpty() || model.files().isEmpty()) {
+			log.info("Nothing to rename. New Names is empty. Please <Fetch Data> first.");
+			return;
+		}
+
 		try {
 			Window window = getWindow(evt.getSource());
 			withWaitCursor(window, () -> {
-				if (model.files().isEmpty() || model.values().isEmpty()) {
-					log.info("Nothing to rename. New Names is empty.");
-					return;
-				}
-
 				Map<File, File> renameMap = checkRenamePlan(validate(model.getRenameMap(), window), window);
 				if (renameMap.isEmpty()) {
 					return;
diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
index 01df7e25..5c81b587 100644
--- a/source/net/filebot/ui/rename/RenamePanel.java
+++ b/source/net/filebot/ui/rename/RenamePanel.java
@@ -16,8 +16,6 @@ import java.awt.Insets;
 import java.awt.Window;
 import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -252,25 +250,21 @@ public class RenamePanel extends JComponent {
 		});
 
 		// reveal file location on double click
-		filesList.getListComponent().addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent evt) {
-				if (evt.getClickCount() == 2) {
-					getWindow(evt.getSource()).setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-					try {
-						JList list = (JList) evt.getSource();
-						if (list.getSelectedIndex() >= 0) {
-							UserFiles.revealFiles(list.getSelectedValuesList());
-						}
-					} catch (Exception e) {
-						debug.log(Level.WARNING, e.getMessage(), e);
-					} finally {
-						getWindow(evt.getSource()).setCursor(Cursor.getDefaultCursor());
+		filesList.getListComponent().addMouseListener(mouseClicked(evt -> {
+			if (evt.getClickCount() == 2) {
+				getWindow(evt.getSource()).setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+				try {
+					JList list = (JList) evt.getSource();
+					if (list.getSelectedIndex() >= 0) {
+						UserFiles.revealFiles(list.getSelectedValuesList());
 					}
+				} catch (Exception e) {
+					debug.log(Level.WARNING, e.getMessage(), e);
+				} finally {
+					getWindow(evt.getSource()).setCursor(Cursor.getDefaultCursor());
 				}
 			}
-		});
+		}));
 
 		// reveal file location on double click
 		namesList.getListComponent().addMouseListener(mouseClicked(evt -> {