Merge pull request #1898 from dotcloud/smallfix_registry
Prevent panic upon error pulling registry
diff --git a/registry/registry.go b/registry/registry.go
index f24e0b3..b3cb866 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -161,10 +161,10 @@
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
