diff --git a/src/helpers/constants.js b/src/helpers/constants.js
index 13391f3..ad26793 100644
--- a/src/helpers/constants.js
+++ b/src/helpers/constants.js
@@ -13,6 +13,7 @@ const Constants = {
         alwaysShowLogDialog: false,
         runTracksConnectionTest: false,
         resolveElectrification: true,
+        skipElectrificationErrorsPropagation: false,
         maxRouteConnectionDistance: 0.2,
         attachSigns: true,
         attachSignsNeedsSameTrack: false,
diff --git a/src/model/electrification-resolver.js b/src/model/electrification-resolver.js
index ba88297..63c0990 100644
--- a/src/model/electrification-resolver.js
+++ b/src/model/electrification-resolver.js
@@ -101,7 +101,7 @@ export default class ElectrificationResolver {
             if(!trackObject.track) {
                 ElectrificationResolver._passWarn(
                     'electrificationNevpNotApplied', 
-                    `NEVP object ${trackObject.id} at track ${trackObject.track_id} has not beed applied. Electrification resolution may fail`
+                    `NEVP object ${trackObject.name} (${trackObject.id}) at track ${trackObject.track_id} has not been applied. Electrification resolution may fail`
                 );
                 return;
             }
@@ -112,6 +112,9 @@ export default class ElectrificationResolver {
 
     static _propagate(scenery, track, skipTrackIds, status) {
         if (track.electrificationStatus === status) return; // already set
+        if (Constants.parser.skipElectrificationErrorsPropagation && status === ElectrificationStatus.CONFLICT) {
+            return;
+        }
 
         const fse = status === ElectrificationStatus.ELECTRIFIED;
         const fsne = status === ElectrificationStatus.NON_ELECTRIFIED;