* I2PControl.cpp :

* unwrap big else {} block
  * smaller try {} block, only for json parsing & request handling
  * respond with valid error message on exception

I2PControl.cpp

@@ -188,9 +188,8 @@ namespace client
 		if (ecode) {
 			LogPrint (eLogError, "I2PControl: read error: ", ecode.message ());
 			return;
-		} else {
-			try
-			{
+		}
+		/* try to parse received data */
 		std::stringstream json;
 		std::string response;
 		bool isHTTP = false;
@@ -221,14 +220,15 @@ namespace client
 		LogPrint (eLogError, "I2PControl: json_read is not supported due bug in boost 1.49 with gcc 4.7");
 		BuildErrorResponse(response, 32603, "JSON requests is not supported with this version of boost");
 #else
+		/* now try to parse json itself */
+		try {
 			boost::property_tree::ptree pt;
 			boost::property_tree::read_json (json, pt);
 
 			std::string id     = pt.get<std::string>("id");
 			std::string method = pt.get<std::string>("method");
 			auto it = m_MethodHandlers.find (method);
-				if (it != m_MethodHandlers.end ())
-				{
+			if (it != m_MethodHandlers.end ()) {
 				std::ostringstream ss;
 				ss << "{\"id\":" << id << ",\"result\":{";
 				(this->*(it->second))(pt.get_child ("params"), ss);
@@ -238,19 +238,14 @@ namespace client
 				LogPrint (eLogWarning, "I2PControl: unknown method ", method);
 				BuildErrorResponse(response, 32601, "Method not found");
 			}
-#endif
-				SendResponse (socket, buf, response, isHTTP);
-			}
-			catch (std::exception& ex)
-			{
+		} catch (std::exception& ex) {
 			LogPrint (eLogError, "I2PControl: exception when handle request: ", ex.what ());
-				/* TODO: also send error, code 32603 */
-			}
-			catch (...)
-			{
+			BuildErrorResponse(response, 32603, ex.what());
+		} catch (...) {
 			LogPrint (eLogError, "I2PControl: handle request unknown exception");
 		}
-		}
+#endif
+		SendResponse (socket, buf, response, isHTTP);
 	}
 
 	void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, int value) const