diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
index 559bf2fb9..10b37565c 100755
--- a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Firstname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
         $subscriberFirstName = $row->getData('subscriber_firstname');
         $customerFirstName = $row->getData('customer_firstname');
         if ($customerFirstName) {
-            return $customerFirstName;
+            return $this->escapeHtml($customerFirstName);
         } elseif ($subscriberFirstName) {
-            return $subscriberFirstName;
+            return $this->escapeHtml($subscriberFirstName);
         } else {
             return '----';
         }
diff --git a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
index 82017d6f6..fa2145921 100755
--- a/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
+++ b/app/code/community/Ebizmarts/MailChimp/Block/Adminhtml/Newsletter/Subscriber/Renderer/Lastname.php
@@ -13,9 +13,9 @@ public function render(Varien_Object $row)
         $subscriberLastName = $row->getData('subscriber_lastname');
         $customerLastName = $row->getData('customer_lastname');
         if ($customerLastName) {
-            return $customerLastName;
+            return $this->escapeHtml($customerLastName);
         } elseif ($subscriberLastName) {
-            return $subscriberLastName;
+            return $this->escapeHtml($subscriberLastName);
         } else {
             return '----';
         }
diff --git a/lib/Mandrill/Mandrill/Exceptions.php b/lib/Mandrill/Mandrill/Exceptions.php
index 60622501b..b84fe707e 100755
--- a/lib/Mandrill/Mandrill/Exceptions.php
+++ b/lib/Mandrill/Mandrill/Exceptions.php
@@ -1,6 +1,5 @@
 <?php
-// This is an external library.
-// @codingStandardsIgnoreStart
+
 class Mandrill_Error extends Exception
 {
 }
@@ -211,5 +210,4 @@ class Mandrill_Metadata_FieldLimit extends Mandrill_Error
 class Mandrill_Unknown_MetadataField extends Mandrill_Error
 {
 }
-// @codingStandardsIgnoreEnd