diff --git a/docs/registry_test.go b/docs/registry_test.go
index d24a5f57..5fd80da1 100644
--- a/docs/registry_test.go
+++ b/docs/registry_test.go
@@ -58,10 +58,11 @@ func TestGetRemoteHistory(t *testing.T) {
 
 func TestLookupRemoteImage(t *testing.T) {
 	r := spawnTestRegistrySession(t)
-	found := r.LookupRemoteImage(imageID, makeURL("/v1/"), token)
-	assertEqual(t, found, true, "Expected remote lookup to succeed")
-	found = r.LookupRemoteImage("abcdef", makeURL("/v1/"), token)
-	assertEqual(t, found, false, "Expected remote lookup to fail")
+	err := r.LookupRemoteImage(imageID, makeURL("/v1/"), token)
+	assertEqual(t, err, nil, "Expected error of remote lookup to nil")
+	if err := r.LookupRemoteImage("abcdef", makeURL("/v1/"), token); err == nil {
+		t.Fatal("Expected error of remote lookup to not nil")
+	}
 }
 
 func TestGetRemoteImageJSON(t *testing.T) {
diff --git a/docs/session.go b/docs/session.go
index 4b2f5522..28cf18fb 100644
--- a/docs/session.go
+++ b/docs/session.go
@@ -102,22 +102,21 @@ func (r *Session) GetRemoteHistory(imgID, registry string, token []string) ([]st
 }
 
 // Check if an image exists in the Registry
-// TODO: This method should return the errors instead of masking them and returning false
-func (r *Session) LookupRemoteImage(imgID, registry string, token []string) bool {
-
+func (r *Session) LookupRemoteImage(imgID, registry string, token []string) error {
 	req, err := r.reqFactory.NewRequest("GET", registry+"images/"+imgID+"/json", nil)
 	if err != nil {
-		log.Errorf("Error in LookupRemoteImage %s", err)
-		return false
+		return err
 	}
 	setTokenAuth(req, token)
 	res, _, err := r.doRequest(req)
 	if err != nil {
-		log.Errorf("Error in LookupRemoteImage %s", err)
-		return false
+		return err
 	}
 	res.Body.Close()
-	return res.StatusCode == 200
+	if res.StatusCode != 200 {
+		return utils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d", res.StatusCode), res)
+	}
+	return nil
 }
 
 // Retrieve an image from the Registry.