diff -Naur -x '*~' -x '*.rej' -x '*.orig' bash-completion-20100203/contrib/ssh bash-completion-20100203-scp-remote/contrib/ssh
--- bash-completion-20100203/contrib/ssh	2010-02-02 19:02:26.000000000 +0100
+++ bash-completion-20100203-scp-remote/contrib/ssh	2010-02-03 23:01:45.000000000 +0100
@@ -250,6 +250,9 @@
 # only.  Returns paths escaped with three backslashes.
 _scp_remote_files()
 {
+    # return if COMP_SCP_REMOTE is not set
+    [ -n "{$COMP_SCP_REMOTE:-}" ] || return 0
+
     local IFS=$'\t\n'
 
     # remove backslash escape from the first colon