Merge pull request #413 from zoitravel/master

Handle null and undefined values in substitutions

Author: thinkingserious

lib/helpers/mail/mail.js

@@ -623,7 +623,13 @@ function Personalization() {
       this.substitutions = {};
     }
     var currentKey = Object.keys(substitution)[0];
-    this.substitutions[currentKey] = substitution[currentKey].toString();
+    var currentVal = substitution[currentKey];
+    if (currentVal === null || typeof currentVal === 'undefined') {
+      this.substitutions[currentKey] = '';
+    }
+    else {
+      this.substitutions[currentKey] = currentVal.toString();
+    }
   };
 
   this.getSubstitutions = function() {