diff --git a/boot.php b/boot.php
index 8492b8be..3edd4597 100644
--- a/boot.php
+++ b/boot.php
@@ -3,7 +3,7 @@
 set_time_limit(0);
 
 define ( 'BUILD_ID',               1038   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0905' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0906' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
diff --git a/include/oembed.php b/include/oembed.php
index 37923a87..4d6b0af1 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -79,7 +79,10 @@ function oe_get_inner_html( $node ) {
  * and replace it with [embed]url[/embed]
  */
 function oembed_html2bbcode($text) {
-	$dom = DOMDocument::loadHTML($text);
+	// If it doesn't parse at all, just return the text.
+	$dom = @DOMDocument::loadHTML($text);
+	if(! $dom)
+		return $text;
 	$xpath = new DOMXPath($dom);
 	$attr = "oembed";