diff --git a/xs_httpd.h b/xs_httpd.h
index e01b660..3eacc5f 100644
--- a/xs_httpd.h
+++ b/xs_httpd.h
@@ -236,12 +236,12 @@ xs_dict *xs_httpd_request(FILE *f, xs_str **payload, int *p_size)
 
     v = xs_dict_get(req, "content-type");
 
-    if (v && strcmp(v, "application/x-www-form-urlencoded") == 0) {
+    if (*payload && v && strcmp(v, "application/x-www-form-urlencoded") == 0) {
         xs *upl = xs_url_dec(*payload);
         p_vars  = xs_url_vars(upl);
     }
     else
-    if (v && xs_startswith(v, "multipart/form-data")) {
+    if (*payload && v && xs_startswith(v, "multipart/form-data")) {
         p_vars = _xs_multipart_form_data(*payload, *p_size, v);
     }
     else
diff --git a/xs_version.h b/xs_version.h
index a8d4397..1d59f5e 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
-/* ff134685f4cb4096c6fce0a2a946be2663ff196e */
+/* a885c7cc4c8e6384ae23125ed05f434471ccc6fb */