1 files changed, 3 insertions, 2 deletions
diff --git a/g10/g10.c b/g10/g10.c
index c52876a97..397dfa42c 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2074,8 +2074,9 @@ main( int argc, char **argv )
 #endif /* __riscos__ */
             break;
 	  case oKeyServer:
-	    opt.keyserver.uri=m_strdup(pargs.r.ret_str);
-	    if(parse_keyserver_uri(pargs.r.ret_str,configname,configlineno))
+	    opt.keyserver=parse_keyserver_uri(pargs.r.ret_str,
+					      configname,configlineno);
+	    if(!opt.keyserver)
 	      log_error(_("could not parse keyserver URI\n"));
 	    break;
 	  case oKeyServerOptions: