diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py
index 7fe01181772..e7214251907 100644
--- a/Tools/faqwiz/faqwiz.py
+++ b/Tools/faqwiz/faqwiz.py
@@ -328,6 +328,7 @@ def parse(self, file):
     def roulette(self):
 	self.__fill()
 	import whrandom
+	if not self.__files: return None
 	return whrandom.choice(self.__files)
 
     def list(self):
@@ -576,8 +577,11 @@ def do_recent(self):
 	emit(TAIL_RECENT)
 
     def do_roulette(self):
-	self.prologue(T_ROULETTE)
 	file = self.dir.roulette()
+	if not file:
+	    self.error("No entries.")
+	    return
+	self.prologue(T_ROULETTE)
 	self.dir.show(file)
 
     def do_help(self):