diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 79ddd905f4..5c50597393 100644
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -102,6 +102,10 @@ CURLcode add_file_name_to_url(CURL *curl, char **inurlp, const char *filename)
       goto out;
     }
     uerr = curl_url_get(uh, CURLUPART_QUERY, &query, 0);
+    if(uerr == CURLUE_OUT_OF_MEMORY) {
+      result = urlerr_cvt(uerr);
+      goto out;
+    }
     if(!uerr && query) {
       curl_free(query);
       result = CURLE_OK;