1 files changed, 9 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 0d489869..38c34e17 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -55,12 +55,19 @@ start_link() ->
         end,
 
     % and off we go
-    {ok, Pid} = mochiweb_http:start([
+    
+    {ok, Pid} = case mochiweb_http:start([
         {loop, Loop},
         {name, ?MODULE},
         {ip, BindAddress},
         {port, Port}
-    ]),
+    ]) of
+    {ok, MochiPid} -> {ok, MochiPid};
+    {error, Reason} ->
+        io:format("Failure to start Mochiweb: ~s~n",[Reason]),
+        throw({error, Reason})
+    end,
+
     ok = couch_config:register(
         fun("httpd", "bind_address") ->
             ?MODULE:stop();