diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9b1eb16..71c2cd0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
           command: |
             SSH_HOST=$(echo ${DOCKER_HOST} | sed 's|.*://||;s|:.*||;')
             ssh-keyscan ${SSH_HOST} >>~/.ssh/known_hosts
-            ssh -C2TnN -4 -D 9050 -i ~/.ssh/id_rsa_circleci_remote_docker_engine ${SSH_HOST}
+            ssh -C2TnN -4 -D 9050 -i ~/.ssh/id_rsa* ${SSH_HOST}
       - run:
           name: Wait for SSH tunnel to become available
           environment:
diff --git a/api/v1/registry/client/client.go b/api/v1/registry/client/client.go
index 59f8f45..022645a 100644
--- a/api/v1/registry/client/client.go
+++ b/api/v1/registry/client/client.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"reflect"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -176,7 +177,7 @@ func decodeAllTagData(body io.ReadCloser) ([]string, map[string]manifest.Manifes
 }
 
 func (cli *RegistryClient) repoToken(repoPath string) (auth.Token, error) {
-	if cli.Token != nil && cli.Token.Method() != "Bearer" {
+	if cli.Token != nil && !reflect.ValueOf(cli.Token).IsNil() && cli.Token.Method() != "Bearer" {
 		return cli.Token, nil
 	}