diff --git a/network.go b/network.go
index 108d78a..366f426 100644
--- a/network.go
+++ b/network.go
@@ -6,7 +6,9 @@ import (
 )
 
 func getHostByName(name string) string {
-	addrs, _ := net.LookupHost(name)
-	//TODO: add error handing when release v3 comes out
+	addrs, err := net.LookupHost(name)
+	if err != nil || len(addrs) == 0 {
+		return name
+	}
 	return addrs[rand.Intn(len(addrs))]
 }