diff --git a/src/Generators/HTML.php b/src/Generators/HTML.php
index b7e209f46a..95ed6b66b0 100644
--- a/src/Generators/HTML.php
+++ b/src/Generators/HTML.php
@@ -318,7 +318,12 @@ protected function printTextBlock(DOMNode $node)
      */
     protected function getFormattedTextBlock(DOMNode $node)
     {
-        $content = trim($node->nodeValue);
+        $content = $node->nodeValue;
+        if (empty($content) === true) {
+            return '';
+        }
+
+        $content = trim($content);
         $content = htmlspecialchars($content, (ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401));
 
         // Allow only em tags.
diff --git a/src/Generators/Markdown.php b/src/Generators/Markdown.php
index d03d06a115..df2e186307 100644
--- a/src/Generators/Markdown.php
+++ b/src/Generators/Markdown.php
@@ -178,7 +178,12 @@ protected function printTextBlock(DOMNode $node)
      */
     protected function getFormattedTextBlock(DOMNode $node)
     {
-        $content = trim($node->nodeValue);
+        $content = $node->nodeValue;
+        if (empty($content) === true) {
+            return '';
+        }
+
+        $content = trim($content);
         $content = htmlspecialchars($content, (ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401));
         $content = str_replace('<em>', '*', $content);
         $content = str_replace('</em>', '*', $content);
diff --git a/src/Generators/Text.php b/src/Generators/Text.php
index 486e76c7f9..08ceaa431e 100644
--- a/src/Generators/Text.php
+++ b/src/Generators/Text.php
@@ -124,7 +124,12 @@ protected function printTextBlock(DOMNode $node)
      */
     protected function getFormattedTextBlock(DOMNode $node)
     {
-        $text = trim($node->nodeValue);
+        $text = $node->nodeValue;
+        if (empty($text) === true) {
+            return '';
+        }
+
+        $text = trim($text);
         $text = str_replace('<em>', '*', $text);
         $text = str_replace('</em>', '*', $text);
 
diff --git a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.html b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.html
index b5fbf05b9c..058a3026f4 100644
--- a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.html
+++ b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.html
@@ -72,7 +72,6 @@
   <h1>GeneratorTest Coding Standards</h1>
   <a name="Standard-Element,-no-content" />
   <h2>Standard Element, no content</h2>
-  <p class="text"></p>
   <table class="code-comparison">
    <tr>
     <td class="code-comparison-title">Valid: Lorem ipsum dolor sit amet.</td>
diff --git a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.md b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.md
index 8a97b98604..8d5dbc254a 100644
--- a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.md
+++ b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.md
@@ -2,7 +2,6 @@
 
 ## Standard Element, no content
 
-
   <table>
    <tr>
     <th>Valid: Lorem ipsum dolor sit amet.</th>
diff --git a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.txt b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.txt
index cb65d4f4c6..c0b96c7b75 100644
--- a/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.txt
+++ b/tests/Core/Generators/Expectations/ExpectedOutputInvalidStandardNoContent.txt
@@ -3,8 +3,6 @@
 | GENERATORTEST CODING STANDARD: STANDARD ELEMENT, NO CONTENT |
 ---------------------------------------------------------------
 
-
-
 ----------------------------------------- CODE COMPARISON ------------------------------------------
 | Valid: Lorem ipsum dolor sit amet.             | Invalid: Maecenas non rutrum dolor.             |
 ----------------------------------------------------------------------------------------------------