diff --git a/src/main.rs b/src/main.rs
index 8b02a29..8e185a6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,7 @@ use iron::prelude::*;
 use iron::headers::{ Authorization, Bearer };
 use iron::status::Status;
 use router::Router;
-use urlencoded::UrlEncodedQuery;
+use urlencoded::{ UrlDecodingError, UrlEncodedQuery };
 use std::env;
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -44,7 +44,8 @@ fn main() {
                     }
                 }
             },
-            Err(_) => return Ok(Response::with((Status::BadRequest, "400 Bad Request"))),
+            Err(UrlDecodingError::BodyError(_)) => return Ok(Response::with((Status::BadRequest, "400 Bad Request"))),
+            Err(UrlDecodingError::EmptyQuery) => (),
         };
 
         // Check token from Authorization header