diff --git a/phpBB/posting.php b/phpBB/posting.php
index dd512abe07..b8fdd2bb08 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -318,6 +318,10 @@ if ( $result = $db->sql_query($sql) )
 		$post_data['has_poll'] = false;
 		$post_data['edit_poll'] = false;
 	}
+	if ( $mode = 'poll_delete' && !isset($poll_id) )
+	{
+		message_die(GENERAL_MESSAGE, $lang['No_such_post']);
+	}
 }
 else
 {