From 4ee63cd54360c579b3eb1dcc0c9f4eb15a5a680d Mon Sep 17 00:00:00 2001
From: Martin Portevin <DrMartinGonzo@users.noreply.github.com>
Date: Tue, 16 Feb 2016 19:33:17 +0100
Subject: [PATCH 1/2] Don't escape html for form error message

---
 code/SilverChimpSubscriptionPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/SilverChimpSubscriptionPage.php b/code/SilverChimpSubscriptionPage.php
index 42ce3b0..0aa3131 100644
--- a/code/SilverChimpSubscriptionPage.php
+++ b/code/SilverChimpSubscriptionPage.php
@@ -342,7 +342,7 @@ function SubscribeAction($raw_data, $form) {
             
         } else {
             //    failure!
-            $form->sessionMessage($this->api->errorMessage, 'warning');
+            $form->sessionMessage($this->api->errorMessage, 'warning', false);
             return $this;
         }
     }

From 008a85e1f858bc4bf60cf0eef726b2efbb934151 Mon Sep 17 00:00:00 2001
From: Martin Portevin <DrMartinGonzo@users.noreply.github.com>
Date: Sat, 20 Feb 2016 22:20:36 +0100
Subject: [PATCH 2/2] Error handling

---
 code/SilverChimpSubscriptionPage.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/SilverChimpSubscriptionPage.php b/code/SilverChimpSubscriptionPage.php
index 0aa3131..a22801d 100644
--- a/code/SilverChimpSubscriptionPage.php
+++ b/code/SilverChimpSubscriptionPage.php
@@ -197,6 +197,11 @@ function Form() {
         }
 
         $mergeVars = $this->api->listMergeVars($this->ListID);
+        
+        if(false === $mergeVars) {
+            return $this->api->errorMessage;
+        }
+        
         $fields = array();
         $required = array();