diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 85d259117..2e4925a1f 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -19,6 +19,9 @@ sub gen_wrapper () { #{{{
 		error("cannot create a wrapper that uses a setup file");
 	}
 	my $wrapper=possibly_foolish_untaint($config{wrapper});
+	if (! defined $wrapper || ! length $wrapper) {
+		error("wrapper filename not specified");
+	}
 	delete $config{wrapper};
 	
 	my @envsave;
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 5353c37b8..9e4d00726 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -34,11 +34,9 @@ use IkiWiki::Setup::Standard {
 		},
 		#{
 		#	# The cgi wrapper.
-		#	cgiwrapper => {
-		#		cgi => 1,
-		#		wrapper => "/var/www/wiki/ikiwiki.cgi",
-		#		wrappermode => "06755",
-		#	},
+		#	cgi => 1,
+		#	wrapper => "/var/www/wiki/ikiwiki.cgi",
+		#	wrappermode => "06755",
 		#},
 	],