diff --git a/core/ftn_address.js b/core/ftn_address.js
index 36ed3400..ec383c7e 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -135,7 +135,7 @@ module.exports = class Address {
     static fromString(addrStr) {
         const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-        if (m) {
+        if (m && m[2] && m[3]) {
             //  start with a 2D
             let addr = {
                 net: parseInt(m[2]),
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 61c52a52..4c5521d1 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -91,7 +91,7 @@ function validateGeneralMailAddressedTo(data, cb) {
     //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
-    if (Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+    if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
         return cb(null);
     }