diff --git a/src/main.rs b/src/main.rs
index 5ca5c6c1f6d463eed1a9b56f941bd224ea6e5c03..67f67caaa0514903dc83b9b7bde3a491e1179901 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -509,16 +509,13 @@ impl MainHandler {
                 match multipart.save().size_limit(self.upload_size_limit).temp() {
                     SaveResult::Full(entries) => {
                         // Pull out csrf field to check if token matches one generated
-                        let csrf_field = match entries.fields.get("csrf") {
-                            Some(fields) => match fields.first() {
-                                Some(field) => field,
-                                None => {
-                                    return Err((
-                                        status::BadRequest,
-                                        String::from("csrf parameter not provided"),
-                                    ))
-                                }
-                            },
+                        let csrf_field = match entries
+                            .fields
+                            .get("csrf")
+                            .map(|fields| fields.first())
+                            .unwrap_or(None)
+                        {
+                            Some(field) => field,
                             None => {
                                 return Err((
                                     status::BadRequest,