diff --git a/Toon/MessageHandler.cpp b/Toon/MessageHandler.cpp
index 66831a0..f7c7075 100644
--- a/Toon/MessageHandler.cpp
+++ b/Toon/MessageHandler.cpp
@@ -18,6 +18,10 @@ MessageHandler::~MessageHandler()
 
 void MessageHandler::HandleMessage(const std::string& message)
 {
+	std::stringstream ss;
+	ss << "Message Received: " << message << std::endl;
+	Logging::Log(Logging::Severity::Info, ss.str());
+
 	nlohmann::json data = nlohmann::json::parse(message);
 
 	if (data.contains("code"))
diff --git a/Toon/WebSocketSubscription.cpp b/Toon/WebSocketSubscription.cpp
index 0f337f8..2c6efb9 100644
--- a/Toon/WebSocketSubscription.cpp
+++ b/Toon/WebSocketSubscription.cpp
@@ -46,7 +46,21 @@ void WebSocketSubscription::OpenWebSocket()
 	request.Headers(RequestHeaders());
 	request.Data(data.dump());
 
-	std::string returnValue = m_httpClient.Open(request);
+	try
+	{
+		m_httpClient.Open(request);
+	}
+	catch (const std::exception& e)
+	{
+		std::stringstream ss;
+		ss << "Error Opening Websocket: " << std::endl;
+		ss << "Type : " << typeid(e).name() << std::endl;
+		ss << "ERROR: " << e.what() << std::endl;
+
+		Logging::Log(Logging::Severity::Error, ss.str());
+
+		throw std::runtime_error("Error Connecting to Toon WebService.");
+	}
 }
 
 void WebSocketSubscription::WebSocketStatus()
@@ -75,6 +89,10 @@ void WebSocketSubscription::CloseWebSocket()
 	request.Headers(RequestHeaders());
 
 	std::string returnValue = m_httpClient.Open(request);
+
+	std::stringstream ss;
+	ss << "Closing Websocket: " << returnValue << std::endl;
+	Logging::Log(Logging::Severity::Info, ss.str());
 }
 
 std::vector<std::string> WebSocketSubscription::RequestHeaders()