From 49736d5fc7f170788230c1f24eca3e903842fd69 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <charmes.guillaume@gmail.com>
Date: Mon, 16 Sep 2013 16:18:25 -0700
Subject: [PATCH] Prevent panic upon error pulling registry

---
 docs/registry.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/registry.go b/docs/registry.go
index f24e0b35..b3cb8660 100644
--- a/docs/registry.go
+++ b/docs/registry.go
@@ -161,10 +161,10 @@ func (r *Registry) GetRemoteHistory(imgID, registry string, token []string) ([]s
 	req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
 	res, err := doWithCookies(r.client, req)
 	if err != nil || res.StatusCode != 200 {
-		if res.StatusCode == 401 {
-			return nil, ErrLoginRequired
-		}
 		if res != nil {
+			if res.StatusCode == 401 {
+				return nil, ErrLoginRequired
+			}
 			return nil, utils.NewHTTPRequestError(fmt.Sprintf("Internal server error: %d trying to fetch remote history for %s", res.StatusCode, imgID), res)
 		}
 		return nil, err