diff --git a/flexradio.go b/flexradio.go
index 2600a6b..97b6ec7 100644
--- a/flexradio.go
+++ b/flexradio.go
@@ -307,7 +307,6 @@ func DiscoverFlexRadio() (bool, *Discovery) {
 		if err != nil {
 			Log.Errorln("Could not receive UDP packets to discover FlexRadio")
 		}
-		defer pc.Close()
 
 		buf := make([]byte, 1024)
 
@@ -321,14 +320,14 @@ func DiscoverFlexRadio() (bool, *Discovery) {
 			match := discoverRe.FindStringSubmatch(string(buf[:n]))
 
 			if len(match) > 0 {
-				d := Discovery{
+				d := &Discovery{
 					NickName: match[4],
 					Model:    match[1],
 					Serial:   match[2],
 					Version:  match[3],
 					IP:       match[5],
 				}
-				return true, &d
+				return true, d
 			}
 		}
 	} else {