diff --git a/source/net/sourceforge/filebot/ui/rename/RenameAction.java b/source/net/sourceforge/filebot/ui/rename/RenameAction.java
index 00458e1b..e8fa35c8 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenameAction.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenameAction.java
@@ -71,8 +71,8 @@ class RenameAction extends AbstractAction {
 	public void actionPerformed(ActionEvent evt) {
 		Window window = getWindow(evt.getSource());
 		try {
-			if (model.files().isEmpty()) {
-				UILogger.info("Nothing to rename. Please add some files and fetch data first.");
+			if (model.files().isEmpty() || model.values().isEmpty()) {
+				UILogger.info("Nothing to rename. Please add some files and fetch naming data first.");
 				return;
 			}