diff -r 0259c2c555fb Lib/socketserver.py
--- a/Lib/socketserver.py	Fri Dec 04 14:52:07 2015 -0800
+++ b/Lib/socketserver.py	Sun Feb 21 20:29:33 2016 +0100
@@ -748,9 +748,6 @@
 
 class DatagramRequestHandler(BaseRequestHandler):
 
-    # XXX Regrettably, I cannot get this working on Linux;
-    # s.recvfrom() doesn't return a meaningful client address.
-
     """Define self.rfile and self.wfile for datagram sockets."""
 
     def setup(self):
@@ -760,4 +757,5 @@
         self.wfile = BytesIO()
 
     def finish(self):
-        self.socket.sendto(self.wfile.getvalue(), self.client_address)
+        if self.wfile.getvalue():
+            self.socket.sendto(self.wfile.getvalue(), self.client_address)