diff --git a/index.php b/index.php
index 0916b61..fb57ece 100644
--- a/index.php
+++ b/index.php
@@ -95,16 +95,27 @@ Flight::route("GET|DELETE /polls/@id:[a-fA-F0-9]+/@token:[a-fA-F0-9]+", function
 	$poll = Poll::load_poll($id);
 	if ($poll)
 	{
-		if ($poll->delete_token !== $token)
-			Flight::halt(401, "<h1>401 Unauthorized</h1><h3>Invalid token.</h3>");
-
-		$poll->delete();
-
 		if (Flight::request()->type === "application/json")
-			Flight::json(format_poll($poll), 204);
+		{
+			if ($poll->delete_token === $token)
+			{
+				$poll->delete();
+
+				Flight::json(format_poll($poll), 204);
+			}
+			else
+				Flight::halt(401, "<h1>401 Unauthorized</h1><h3>Invalid token.</h3>");
+		}
 		else
 		{
-			Flight::redirect('/', 204);
+			if ($poll->delete_token === $token)
+			{
+				$poll->delete();
+
+				Flight::redirect('/', 204);
+			}
+			else
+				Flight::redirect('/', 401);
 		}
 	}
 	else