diff --git a/cmdline.c b/cmdline.c
index 3e890b78..bdfa1aa2 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -315,7 +315,14 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     if (!strcmp(p, "-pw")) {
 	RETURN(2);
 	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
-	cmdline_password = value;
+	SAVEABLE(1);
+	/* We delay evaluating this until after the protocol is decided,
+	 * so that we can warn if it's of no use with the selected protocol */
+	if (cfg->protocol != PROT_SSH)
+	    cmdline_error("The -pw option can only be used with the "
+			  "SSH protocol");
+	else
+	    cmdline_password = value;
     }
 
     if (!strcmp(p, "-agent") || !strcmp(p, "-pagent") ||