4 files changed, 20 insertions, 7 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 4e23b4a4770..578bc7aa61f 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -79,6 +79,9 @@
 
 inline float finiteAlways(float f) { return std::isfinite(f) ? f : 0.0f; }
 
+inline unsigned long atoul(char const* str) { return strtoul(str, nullptr, 10); }
+inline unsigned long long atoull(char const* str) { return strtoull(str, nullptr, 10); }
+
 #define STRINGIZE(a) #a
 
 enum TimeConstants
@@ -118,7 +121,6 @@ const uint8 TOTAL_LOCALES = 9;
 #define DEFAULT_LOCALE LOCALE_enUS
 
 #define MAX_LOCALES 8
-#define MAX_ACCOUNT_TUTORIAL_VALUES 8
 
 extern char const* localeNames[TOTAL_LOCALES];
 
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index d3e29ceaaea..5c891d925fa 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -34,7 +34,9 @@
 using boost::asio::ip::tcp;
 
 #define READ_BLOCK_SIZE 4096
-#define TC_SOCKET_USE_IOCP BOOST_ASIO_HAS_IOCP
+#ifdef BOOST_ASIO_HAS_IOCP
+#define TC_SOCKET_USE_IOCP
+#endif
 
 template<class T>
 class Socket : public std::enable_shared_from_this<T>
diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h
index 92c16d96882..c004295bc1a 100644
--- a/src/server/shared/Networking/SocketMgr.h
+++ b/src/server/shared/Networking/SocketMgr.h
@@ -47,7 +47,16 @@ public:
             return false;
         }
 
-        _acceptor = new AsyncAcceptor(service, bindIp, port);
+        try
+        {
+            _acceptor = new AsyncAcceptor(service, bindIp, port);
+        }
+        catch (boost::system::system_error const& err)
+        {
+            TC_LOG_ERROR("network", "Exception caught in SocketMgr.StartNetwork (%s:%u): %s", bindIp.c_str(), port, err.what());
+            return false;
+        }
+
         _threads = CreateThreads();
 
         ASSERT(_threads);
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 8a4f7325add..5aaedfb8ffe 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -33,21 +33,21 @@
 template<typename T>
 struct Optional
 {
-    Optional() : value(), HasValue(false) { }
+    Optional() : Value(), HasValue(false) { }
 
-    T value;
+    T Value;
     bool HasValue;
 
     inline void Set(T const& v)
     {
         HasValue = true;
-        value = v;
+        Value = v;
     }
 
     inline void Clear()
     {
         HasValue = false;
-        value = T();
+        Value = T();
     }
 };