diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index c3ac41ce43..6c441bac6f 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
 				}
 
 				if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-					$text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
+					$text .= '<br /><a href="' . $link . '">' . $link . '</a>';
 				} else {
 					$text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 7b3b843a15..b6c6158871 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -3571,8 +3571,12 @@ class Diaspora
 				$ret["root_guid"] = $guid;
 				return $ret;
 			}
+		} elseif (($guid == "") && $complete) {
+			return false;
 		}
 
+		$ret["root_guid"] = $guid;
+
 		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
 		if ($matches[1] != "") {
@@ -3593,10 +3597,6 @@ class Diaspora
 			}
 		}
 
-		if (!empty($guid)) {
-			$ret["root_guid"] = $guid;
-		}
-
 		if (empty($ret) && !$complete) {
 			return true;
 		}