diff --git a/Net/include/Poco/Net/UDPHandler.h b/Net/include/Poco/Net/UDPHandler.h
index 467cf798d5..f8106caaa2 100644
--- a/Net/include/Poco/Net/UDPHandler.h
+++ b/Net/include/Poco/Net/UDPHandler.h
@@ -297,7 +297,7 @@ class UDPHandlerImpl: public Runnable, public RefCountedObject
 	}
 
 	static char* error(char* buf)
-		/// Returns pointer to the erro message payload.
+		/// Returns pointer to the error message payload.
 		///
 		/// Total message size is S.
 		///
diff --git a/Net/include/Poco/Net/UDPServer.h b/Net/include/Poco/Net/UDPServer.h
index a65036745a..140bc6d2a9 100644
--- a/Net/include/Poco/Net/UDPServer.h
+++ b/Net/include/Poco/Net/UDPServer.h
@@ -38,7 +38,7 @@ template <std::size_t S = POCO_UDP_BUF_SIZE,
 class UDPServerImpl: public Poco::Runnable
 	/// UDP server, runs in its own thread and owns a poller, to which
 	/// data arrival and discovery is delegated. See SingleSocketPoller and
-	/// MultipleSocketPoller for more information.
+	/// MultiSocketPoller for more information.
 {
 public:
 	UDPServerImpl(typename UDPHandlerImpl<S>::List& handlers, const Poco::Net::SocketAddress& sa):
diff --git a/Net/include/Poco/Net/UDPSocketReader.h b/Net/include/Poco/Net/UDPSocketReader.h
index b6af9e0bd2..64f805ba1e 100644
--- a/Net/include/Poco/Net/UDPSocketReader.h
+++ b/Net/include/Poco/Net/UDPSocketReader.h
@@ -154,8 +154,8 @@ class UDPSocketReader
 		/// Returns true if all handlers are stopped.
 	{
 		bool stopped = true;
-		typename UDPHandlerImpl<S>::List::iterator it = _handlers.begin();
-		typename UDPHandlerImpl<S>::List::iterator end = _handlers.end();
+		auto it = _handlers.begin();
+		auto end = _handlers.end();
 		for (; it != end; ++it) stopped = stopped && (*it)->stopped();
 		return stopped;
 	}
@@ -163,8 +163,8 @@ class UDPSocketReader
 	void stopHandler()
 		/// Stops all handlers.
 	{
-		typename UDPHandlerImpl<S>::List::iterator it = _handlers.begin();
-		typename UDPHandlerImpl<S>::List::iterator end = _handlers.end();
+		auto it = _handlers.begin();
+		auto end = _handlers.end();
 		for (; it != end; ++it) (*it)->stop();
 	}
 
@@ -172,8 +172,8 @@ class UDPSocketReader
 		/// Returns true if all handlers are done processing data.
 	{
 		bool done = true;
-		typename UDPHandlerImpl<S>::List::iterator it = _handlers.begin();
-		typename UDPHandlerImpl<S>::List::iterator end = _handlers.end();
+		auto it = _handlers.begin();
+		auto end = _handlers.end();
 		for (; it != end; ++it) done = done && (*it)->done();
 		return done;
 	}
@@ -193,20 +193,19 @@ class UDPSocketReader
 		/// Re-points the handler iterator to the next handler in
 		/// round-robin fashion.
 	{
-		poco_assert_dbg (_handler != _handlers.end());
-		if (++_handler == _handlers.end()) _handler = _handlers.begin();
+		if ((_handler == _handlers.end()) || (++_handler == _handlers.end()))
+			_handler = _handlers.begin();
 	}
 
 	UDPHandlerImpl<S>& handler()
 		/// Returns the reference to the current handler.
 	{
-		poco_assert_dbg (_handler != _handlers.end());
 		return **_handler;
 	}
 
-	typedef typename UDPHandlerImpl<S>::List           HandlerList;
-	typedef typename UDPHandlerImpl<S>::List::iterator HandlerIterator;
-	typedef std::map<poco_socket_t, Counter>           CounterMap;
+	using HandlerList = typename UDPHandlerImpl<S>::List;
+	using HandlerIterator = typename UDPHandlerImpl<S>::List::iterator;
+	using CounterMap = std::map<poco_socket_t, Counter>;
 
 	HandlerList&    _handlers;
 	HandlerIterator _handler;