diff --git a/ChangeLog b/ChangeLog
index bf01f118..e92df924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-13 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+	* main.cs: fix error when --master is passed.
+	Bug #481597 fixed.
+
 2009-03-03  Marek Habersack  <mhabersack@novell.com>
 
 	* src/Mono.WebServer.Apache/ModMonoRequest.cs: removed a
diff --git a/src/Mono.WebServer.Apache/main.cs b/src/Mono.WebServer.Apache/main.cs
index 85e55deb..d665886f 100644
--- a/src/Mono.WebServer.Apache/main.cs
+++ b/src/Mono.WebServer.Apache/main.cs
@@ -361,7 +361,8 @@ public int RealMain (string [] args, bool root, IApplicationHost ext_apphost)
 				webSource.Dispose ();
 				return svr.RealMain (args, false, vh.AppHost);
 			}
-			server.AppHost = ext_apphost;
+			if (ext_apphost != null)
+				server.AppHost = ext_apphost;
 
 			if (!useTCP) {
 				Console.WriteLine ("Listening on: {0}", filename);