Treat all networks and network termination equipment as compromised. Make your general case a special case of your corner case and you won't have to deal with m

Treat all networks and network termination equipment as compromised. Make your general case a special case of your corner case and you won't have to deal with multiple logic paths - at worst you'll have to do some extra work but at least you won't find things broken when you need them most.