diff --git a/src/Entity/ShipTo.php b/src/Entity/ShipTo.php
index f2330cb..23df9f6 100644
--- a/src/Entity/ShipTo.php
+++ b/src/Entity/ShipTo.php
@@ -189,6 +189,10 @@ public function getAttentionName()
      */
     public function setAttentionName($attentionName)
     {
+        if (strlen($attentionName) > 35) {
+            $attentionName = substr($attentionName, 0, 35);
+        }
+
         $this->AttentionName = $attentionName;
         $this->attentionName = $attentionName;
 
@@ -231,6 +235,10 @@ public function getCompanyName()
      */
     public function setCompanyName($companyName)
     {
+        if (strlen($companyName) > 35) {
+            $companyName = substr($companyName, 0, 35);
+        }
+
         $this->CompanyName = $companyName;
         $this->companyName = $companyName;