From 6c628094ce9d57536859ef09f36221f701bc1dcc Mon Sep 17 00:00:00 2001
From: Mikal Villa <mikal@sigterm.no>
Date: Tue, 29 Mar 2016 23:55:29 +0200
Subject: [PATCH] Adding exception handler on HTTP Proxy

---
 ClientContext.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ClientContext.cpp b/ClientContext.cpp
index ccb8e0ad..88d90622 100644
--- a/ClientContext.cpp
+++ b/ClientContext.cpp
@@ -52,8 +52,12 @@ namespace client
 				LoadPrivateKeys (keys, httpProxyKeys);
 				localDestination = CreateNewLocalDestination (keys, false);
 			}
-			m_HttpProxy = new i2p::proxy::HTTPProxy(httpProxyAddr, httpProxyPort, localDestination);
-			m_HttpProxy->Start();
+			try {
+			  m_HttpProxy = new i2p::proxy::HTTPProxy(httpProxyAddr, httpProxyPort, localDestination);
+			  m_HttpProxy->Start();
+			} catch (std::exception& e) {
+			  LogPrint(eLogError, "Exception in HTTP Proxy: ", e.what());
+			}
 		}
 
 		bool socksproxy; i2p::config::GetOption("socksproxy.enabled", socksproxy);