diff --git a/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java b/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java
index 142b631e..909ece95 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java
@@ -77,7 +77,7 @@ class RenameListCellRenderer extends DefaultFancyListCellRenderer {
 			}
 		}
 		
-		if (renameModel.preserveExtension() && renameModel.hasComplement(index)) {
+		if (renameModel.preserveExtension() && index < renameModel.size() && renameModel.getMatch(index).getCandidate() != null) {
 			typeRenderer.setText(getType(renameModel.getMatch(index).getCandidate()));
 			typeRenderer.setVisible(true);
 		}