diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index 8f3dd204a4d..99031ed37b2 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -239,11 +239,15 @@ function set_labels($payload, $labels, $remove) {
 function tag_pr($payload, $opened) {
 	//get the mergeable state
 	$url = $payload['pull_request']['url'];
-	$payload['pull_request'] = json_decode(github_apisend($url), TRUE);
+	$new_pull_request_payload = json_decode(github_apisend($url), TRUE);
+	if (isset($new_pull_request_payload['id']))
+		$payload['pull_request'] = $new_pull_request_payload;
 	if($payload['pull_request']['mergeable'] == null) {
 		//STILL not ready. Give it a bit, then try one more time
 		sleep(10);
-		$payload['pull_request'] = json_decode(github_apisend($url), TRUE);
+		$new_pull_request_payload = json_decode(github_apisend($url), TRUE);
+		if (isset($new_pull_request_payload['id']))
+			$payload['pull_request'] = $new_pull_request_payload;
 	}
 
 	$tags = array();
@@ -645,10 +649,10 @@ $no_changelog = false;
 function checkchangelog($payload) {
 	global $no_changelog;
 	if (!isset($payload['pull_request']) || !isset($payload['pull_request']['body'])) {
-		return;
+		return array();
 	}
 	if (!isset($payload['pull_request']['user']) || !isset($payload['pull_request']['user']['login'])) {
-		return;
+		return array();
 	}
 	$body = $payload['pull_request']['body'];