diff --git a/controllers/common.go b/controllers/common.go
index bcf97f57..638fbcbb 100644
--- a/controllers/common.go
+++ b/controllers/common.go
@@ -54,17 +54,15 @@ func GetPeersList(networkName string) ([]models.Node, error) {
 			if node.UDPHolePunch == "yes" && errN == nil && functions.CheckEndpoint(udppeers[node.PublicKey]) {
 				endpointstring := udppeers[node.PublicKey]
 				endpointarr := strings.Split(endpointstring, ":")
-				log.Println("got values:", endpointstring, endpointarr)
 				if len(endpointarr) == 2 {
 					port, err := strconv.Atoi(endpointarr[1])
 					if err == nil {
-						log.Println("overriding:", endpointarr[0], int32(port))
 						peer.Endpoint = endpointarr[0]
 						peer.ListenPort = int32(port)
 					}
 				}
 			}
-			log.Println("setting peer:", peer.PublicKey, peer.Endpoint, peer.ListenPort)
+			functions.PrintUserLog("netmaker", "sending peer "+peer.MacAddress+" "+peer.Endpoint, 2)
 			peers = append(peers, peer)
 		}
 	}
diff --git a/main.go b/main.go
index 95bd718f..97a7608e 100644
--- a/main.go
+++ b/main.go
@@ -75,7 +75,7 @@ func startControllers() {
 	if servercfg.IsDNSMode() {
 		err := controller.SetDNS()
 		if err != nil {
-			log.Fatal(err)
+			log.Println("error occurred initializing DNS:", err)
 		}
 	}
 	//Run Rest Server