1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index 5a2364c652c..2c8b6dafed5 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -546,7 +546,10 @@ version.")
                           atype
                           host
                           (if (stringp service)
-                              (socks-find-services-entry service)
+                              (or
+                               (socks-find-services-entry service)
+                               (error "Unable to find port for service `%s'"
+                                      service))
                             service))
       (puthash 'buffer buffer info)
       (puthash 'host host info)