diff --git a/src/calibre/srv/http_request.py b/src/calibre/srv/http_request.py
index 68566c3c11..20ca7961ba 100644
--- a/src/calibre/srv/http_request.py
+++ b/src/calibre/srv/http_request.py
@@ -250,7 +250,7 @@ class HTTPRequest(Connection):
 
     @property
     def state_description(self):
-        return 'Request: %s' % force_unicode(self.request_line, 'utf-8')
+        return 'State: %s Request: %s' % (getattr(self.handle_event, '__name__', None), force_unicode(self.request_line, 'utf-8'))
 
     def parse_header_line(self, parser, buf, event):
         line = self.readline(buf)
diff --git a/src/calibre/srv/loop.py b/src/calibre/srv/loop.py
index 9a55ef43d2..79e1ea0681 100644
--- a/src/calibre/srv/loop.py
+++ b/src/calibre/srv/loop.py
@@ -115,6 +115,7 @@ class Connection(object):
         self.wait_for = READ
         self.response_started = False
         self.read_buffer = ReadBuffer()
+        self.handle_event = None
         if self.ssl_context is not None:
             self.ready = False
             self.socket = self.ssl_context.wrap_socket(socket, server_side=True, do_handshake_on_connect=False)
@@ -144,7 +145,9 @@ class Connection(object):
     def set_state(self, wait_for, func, *args, **kwargs):
         self.wait_for = wait_for
         if args or kwargs:
-            func = partial(func, *args, **kwargs)
+            pfunc = partial(func, *args, **kwargs)
+            pfunc.__name__ = func.__name__
+            func = pfunc
         self.handle_event = func
 
     def do_ssl_handshake(self, event):