diff --git a/src/section/SectionBuilder.php b/src/section/SectionBuilder.php
index <HASH>..<HASH> 100644
--- a/src/section/SectionBuilder.php
+++ b/src/section/SectionBuilder.php
@@ -47,7 +47,7 @@ class SectionBuilder extends AbstractBuilder
         if (($content instanceof SafeString) === false) {
             $content = htmlentities($content);
         }
-        $content = nl2br($content);
+        $content = SafeString::fromString(nl2br($content));
 
         $content = FieldBuilder::begin()
             ->setType(Field::FIELD_TYPE_LITERAL)
diff --git a/src/table/TableForm.php b/src/table/TableForm.php
index <HASH>..<HASH> 100644
--- a/src/table/TableForm.php
+++ b/src/table/TableForm.php
@@ -73,7 +73,7 @@ class TableForm implements TableFormInterface
     {
         $row = $this->getPrototypicalRow();
 
-        if ($row !== null) {
+        if ($row === null) {
             $row = $this->getRows()[0];
         }
Designate content as safe after nl2br.