Make router, net, subnet more enshurable.
Merge pull request #748 from xenolog/PRD-2357

Make router, net, subnet more ensurable.