diff --git a/integration/HTMLValue.php b/integration/HTMLValue.php
index ba9580fc3..ee38a6535 100755
--- a/integration/HTMLValue.php
+++ b/integration/HTMLValue.php
@@ -45,17 +45,10 @@ class SS_HTMLValue extends ViewableData {
 	 * @return bool
 	 */
 	public function setContent($content) {
-		//This is a patch to prevent invalid HTML returning warnings.
-		//Error messages are disabled, and then re-enabled
-		$old_level=error_reporting();
-		error_reporting(0);
-		$value=$this->getDocument()->loadHTML(
-				'<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head>' .
-				"<body>$content</body></html>");
-		error_reporting($old_level);
-		return $value;
-		
-		
+		return @$this->getDocument()->loadHTML(
+			'<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head>' .
+			"<body>$content</body></html>"
+		);
 	}
 	
 	/**
@@ -82,4 +75,4 @@ class SS_HTMLValue extends ViewableData {
 		return $this->getContent();
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/tests/integration/HTMLValueTest.php b/tests/integration/HTMLValueTest.php
new file mode 100755
index 000000000..4a69b78bc
--- /dev/null
+++ b/tests/integration/HTMLValueTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package sapphire
+ * @subpackage tests
+ */
+class SS_HTMLValueTest extends SapphireTest {
+	
+	public function testInvalidHTMLSaving() {
+		$value   = new SS_HTMLValue();
+		$invalid = array (
+			'<p>Enclosed Value</p></p>'                              => '<p>Enclosed Value</p>',
+			'<p><div class="example"></div></p>'                     => '<p/><div class="example"/>',
+			'<html><html><body><falsetag "attribute=""attribute""">' => '<falsetag/>',
+			'<body<body<body>/bodu>/body>'                           => '/bodu&gt;/body&gt;'
+		);
+		
+		foreach($invalid as $input => $expected) {
+			$value->setContent($input);
+			$this->assertEquals($expected, $value->getContent(), 'Invalid HTML can be saved');
+		}
+	}
+	
+	public function testInvalidHTMLTagNames() {
+		$value   = new SS_HTMLValue();
+		$invalid = array (
+			'<p><div><a href="test-link"></p></div>',
+			'<html><div><a href="test-link"></a></a></html_>',
+			'""\'\'\'"""\'""<<<>/</<htmlbody><a href="test-link"<<>'
+		);
+		
+		foreach($invalid as $input) {
+			$value->setContent($input);
+			$this->assertEquals (
+				'test-link',
+				$value->getElementsByTagName('a')->item(0)->getAttribute('href'),
+				'Link data can be extraced from malformed HTML'
+			);
+		}
+	}
+	
+}
\ No newline at end of file
