1 files changed, 4 insertions, 1 deletions
diff --git a/ikiwiki.in b/ikiwiki.in
index e0a591824..3bb881c43 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -123,7 +123,10 @@ sub main () { #{{{
 	}
 	elsif ($config{cgi}) {
 		require IkiWiki::CGI;
-		cgi();
+		eval {cgi()};
+		if ($@) {
+			cgierror($@);
+		}
 	}
 	elsif ($config{render}) {
 		require IkiWiki::Render;