1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 1bb29d1766f..77aad29faa5 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -240,10 +240,12 @@ KEY identifies the connection, it is either a process or a vector."
     (aset key 3 nil))
   (tramp-message
    key 7 "%s %s" key
-   (let (properties)
-     (maphash
-      (lambda (x y) (add-to-list 'properties x 'append))
-      (gethash key tramp-cache-data))
+   (let ((hash (gethash key tramp-cache-data))
+         properties)
+     (if (hash-table-p hash)
+         (maphash
+          (lambda (x y) (add-to-list 'properties x 'append))
+          (gethash key tramp-cache-data)))
      properties))
   (setq tramp-cache-data-changed t)
   (remhash key tramp-cache-data))