diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cee4d322d69..a74e9823799 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-27  Daniel Colascione  <dancol@dancol.org>
+
+	* net/tramp-sh.el (tramp-get-remote-path): Don't signal error when
+	explicit tramp path is empty.
+
 2014-02-26  Glenn Morris  <rgm@gnu.org>
 
 	* startup.el (command-line): Don't init the tty in daemon mode.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 37e212970ce..04109f9816c 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4846,7 +4846,7 @@ Return ATTR."
       (when elt1
 	(setcdr elt1
 		(append
- 		 (tramp-compat-split-string default-remote-path ":")
+ 		 (tramp-compat-split-string (or default-remote-path "") ":")
 		 (cdr elt1)))
 	(setq remote-path (delq 'tramp-default-remote-path remote-path)))
 
@@ -4854,7 +4854,7 @@ Return ATTR."
       (when elt2
 	(setcdr elt2
 		(append
- 		 (tramp-compat-split-string own-remote-path ":")
+ 		 (tramp-compat-split-string (or own-remote-path "") ":")
 		 (cdr elt2)))
 	(setq remote-path (delq 'tramp-own-remote-path remote-path)))