diff --git a/cmd/mesh/main.go b/cmd/mesh/main.go
index 6a1a219b..7bf14872 100644
--- a/cmd/mesh/main.go
+++ b/cmd/mesh/main.go
@@ -185,14 +185,14 @@ func setLogLevel(loglevel string, logger *log.Logger) {
 type yggArgs struct {
 	genconf       bool
 	useconf       bool
-	useconffile   string
 	normaliseconf bool
 	confjson      bool
 	autoconf      bool
 	ver           bool
-	logto         string
 	getaddr       bool
 	getsnet       bool
+	useconffile   string
+	logto         string
 	loglevel      string
 }
 
diff --git a/src/tuntap/tun.go b/src/tuntap/tun.go
index 73e38e29..002c8f0e 100644
--- a/src/tuntap/tun.go
+++ b/src/tuntap/tun.go
@@ -114,11 +114,11 @@ func (tun *TunAdapter) _start() error {
 	if tun.isOpen {
 		return errors.New("TUN module is already started")
 	}
-	tun.config.RLock()
-	defer tun.config.RUnlock()
 	if tun.config == nil {
 		return errors.New("no configuration available to TUN")
 	}
+	tun.config.RLock()
+	defer tun.config.RUnlock()
 	tun.addr = tun.rwc.Address()
 	tun.subnet = tun.rwc.Subnet()
 	addr := fmt.Sprintf("%s/%d", net.IP(tun.addr[:]).String(), 8*len(address.GetPrefix())-1)