diff --git a/confluence/api.go b/confluence/api.go
index 61ba7da..bf06cc1 100644
--- a/confluence/api.go
+++ b/confluence/api.go
@@ -180,7 +180,7 @@ func (api *API) FindHomePage(space string) (*PageInfo, error) {
 		return nil, err
 	}
 
-	if request.Raw.StatusCode == http.StatusNotFound || request.Raw.StatusCode != http.StatusOK {
+	if request.Raw.StatusCode != http.StatusOK {
 		return nil, newErrorStatusNotOK(request)
 	}
 
@@ -691,7 +691,7 @@ func (api *API) GetUserByName(name string) (*User, error) {
 	}
 
 	// Try the new path first
-	_, err := api.rest.
+	request, err := api.rest.
 		Res("search").
 		Res("user", &response).
 		Get(map[string]string{
@@ -700,10 +700,13 @@ func (api *API) GetUserByName(name string) (*User, error) {
 	if err != nil {
 		return nil, err
 	}
+	if request.Raw.StatusCode != http.StatusOK {
+		return nil, newErrorStatusNotOK(request)
+	}
 
 	// Try old path
 	if len(response.Results) == 0 {
-		_, err := api.rest.
+		request, err := api.rest.
 			Res("search", &response).
 			Get(map[string]string{
 				"cql": fmt.Sprintf("user.fullname~%q", name),
@@ -711,6 +714,9 @@ func (api *API) GetUserByName(name string) (*User, error) {
 		if err != nil {
 			return nil, err
 		}
+		if request.Raw.StatusCode != http.StatusOK {
+			return nil, newErrorStatusNotOK(request)
+		}
 	}
 
 	if len(response.Results) == 0 {