From 3e83296fc5b41f4c833320abe52b17e4b0d6b3b5 Mon Sep 17 00:00:00 2001
From: Aleksandrs Antonovs <alex.ant0303@gmail.com>
Date: Wed, 6 Feb 2019 13:37:10 +0100
Subject: [PATCH 1/2] Domain func must return an error on failure

The `Domain` function must return an error in case the `publicsuffix`
produces one. This way the respective retries can be carried out.
---
 README.md |  5 ++++-
 check.go  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1a5c4f4..e5c1af8 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,10 @@ import (
 func main() {
         domain := "dreamdomain.io"
 
-        available := available.Domain(domain)
+        available, err := available.Domain(domain)
+        if err != nil {
+                panic(err)
+        }
 
         if available {
                 fmt.Println("[+] Success!")
diff --git a/check.go b/check.go
index a47163b..c29528b 100644
--- a/check.go
+++ b/check.go
@@ -38,22 +38,22 @@ This function does not have a triage step, and will
 result in testing each TLD with one of the default
 responses.
 */
-func Domain(domain string) (available bool) {
-	available = false
-
+func Domain(domain string) (bool, error) {
 	domain = setDomain(domain)
 	tld, icann := publicsuffix.PublicSuffix(domain)
 
+	var available bool
+
 	if icann == true {
 		query, err := publicsuffix.EffectiveTLDPlusOne(domain)
 		if err != nil {
-			return
+			return false, err
 		}
 
 		available = match(tld, getWhois(query))
 	}
 
-	return available
+	return available, nil
 }
 
 func setDomain(domain string) string {

From 43fde9c01d930e646c0192b63a403fd8789f200d Mon Sep 17 00:00:00 2001
From: Aleksandrs Antonovs <alex.ant0303@gmail.com>
Date: Fri, 8 Feb 2019 09:12:53 +0100
Subject: [PATCH 2/2] Check whois error

---
 check.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/check.go b/check.go
index c29528b..bc27357 100644
--- a/check.go
+++ b/check.go
@@ -26,7 +26,12 @@ func SafeDomain(domain string) (available, badtld bool) {
 		}
 
 		if !badtld {
-			available = match(tld, getWhois(query))
+			whois, err := getWhois(query)
+			if err != nil {
+				return
+			}
+
+			available = match(tld, whois)
 		}
 	}
 
@@ -50,7 +55,12 @@ func Domain(domain string) (bool, error) {
 			return false, err
 		}
 
-		available = match(tld, getWhois(query))
+		whois, err := getWhois(query)
+		if err != nil {
+			return false, err
+		}
+
+		available = match(tld, whois)
 	}
 
 	return available, nil
@@ -107,18 +117,18 @@ func match(tld, resp string) (available bool) {
 }
 
 // Makes whois request, returns resposne as string
-func getWhois(domain string) (response string) {
+func getWhois(domain string) (string, error) {
 	req, err := whois.NewRequest(domain)
 	if err != nil {
-		return
+		return "", err
 	}
 
 	resp, err := whois.DefaultClient.Fetch(req)
 	if err != nil {
-		return
+		return "", err
 	}
 
-	return fmt.Sprintf("%s", resp)
+	return fmt.Sprintf("%s", resp), nil
 }
 
 // Checks if the TLD is apart of our "bad tld" list