diff --git a/iface/iface.go b/iface/iface.go
index 5b491cceb..fe86eb238 100644
--- a/iface/iface.go
+++ b/iface/iface.go
@@ -29,7 +29,10 @@ func Create(iface string, address string) error {
 
 	// We need to create a wireguard-go device and listen to configuration requests
 	tunDevice := device.NewDevice(tunIface, conn.NewDefaultBind(), device.NewLogger(device.LogLevelSilent, "[wiretrustee] "))
-	tunDevice.Up()
+	err = tunDevice.Up()
+	if err != nil {
+		return err
+	}
 	uapi, err := getUAPI(iface)
 	if err != nil {
 		return err
@@ -37,12 +40,12 @@ func Create(iface string, address string) error {
 
 	go func() {
 		for {
-			conn, err := uapi.Accept()
+			uapiConn, err := uapi.Accept()
 			if err != nil {
 				log.Debugln(err)
 				return
 			}
-			go tunDevice.IpcHandle(conn)
+			go tunDevice.IpcHandle(uapiConn)
 		}
 	}()
 
diff --git a/iface/iface_linux.go b/iface/iface_linux.go
index 35206810a..346ac5a0a 100644
--- a/iface/iface_linux.go
+++ b/iface/iface_linux.go
@@ -17,6 +17,9 @@ func assignAddr(address string, tunDevice tun.Device) error {
 	var err error
 	attrs := netlink.NewLinkAttrs()
 	attrs.Name, err = tunDevice.Name()
+	if err != nil {
+		return err
+	}
 
 	link := wgLink{
 		attrs: &attrs,