Merge pull request #37 from jeff-chastain/development

Email Type Check Fix

Author: lmajano

models/MailService.cfc

@@ -377,7 +377,7 @@ component accessors="true" singleton threadsafe {
 		var key         = "";
 
 		// Do not process tokens if using dynamic template (send-grid-protocol)
-		if ( arguments.mail.getType() == "template" ) return;
+		if ( arguments.mail.propertyExists( "type" ) && arguments.mail.getType() == "template" ) return;
 
 		// Check mail parts for content
 		if ( arrayLen( mailparts ) ) {