diff --git a/include/items.php b/include/items.php
index 483540f46a..c963d91890 100644
--- a/include/items.php
+++ b/include/items.php
@@ -753,7 +753,7 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 			$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
 			$new_name = $elems['name'][0]['data'];
 		} 
-		if(($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
+		if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
 			$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
 			$photo_url = $elems['link'][0]['attribs']['']['href'];
 		}
diff --git a/include/poller.php b/include/poller.php
index b9a4f22347..f214625a19 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -180,7 +180,7 @@
 		consume_feed($xml,$importer,$contact,$hub);
 
 		if((strlen($hub)) && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
-			logger('poller: subscribing to hub(s) : ' . $hubs . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+			logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
 			$hubs = explode(',', $hub);
 			if(count($hubs)) {
 				foreach($hubs as $h) {
diff --git a/mod/pubsub.php b/mod/pubsub.php
index e3392668e6..760ffa9e9f 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -29,15 +29,15 @@ function hub_post_return() {
 function pubsub_init(&$a) {
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	if($_SERVER['REQUEST_METHOD'] === 'GET') {
 
-		$hub_mode = notags(trim($_GET['hub_mode']));
-		$hub_topic = notags(trim($_GET['hub_topic']));
-		$hub_challenge = notags(trim($_GET['hub_challenge']));
-		$hub_lease = notags(trim($_GET['hub_lease_seconds']));
-		$hub_verify = notags(trim($_GET['hub_verify_token']));
+		$hub_mode      = ((x($_GET,'hub_mode'))          ? notags(trim($_GET['hub_mode']))          : '');
+		$hub_topic     = ((x($_GET,'hub_topic'))         ? notags(trim($_GET['hub_topic']))         : '');
+		$hub_challenge = ((x($_GET,'hub_challenge'))     ? notags(trim($_GET['hub_challenge']))     : '');
+		$hub_lease     = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : '');
+		$hub_verify    = ((x($_GET,'hub_verify_token'))  ? notags(trim($_GET['hub_verify_token']))  : '');
 
 		logger('pubsub: Subscription from' . $_SERVER['REMOTE_ADDR'] . print_r($_GET,true));
 
@@ -75,8 +75,7 @@ function pubsub_init(&$a) {
 			intval($contact['id'])
 		);
 
- 		hub_return(true, $hub_challenge);
-		
+ 		hub_return(true, $hub_challenge);		
 	}
 }
 
@@ -91,7 +90,7 @@ function pubsub_post(&$a) {
 	logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($nick)