diff --git a/cmd/drone-docker-ecr/main.go b/cmd/drone-docker-ecr/main.go
index 3f518b0..54a6913 100644
--- a/cmd/drone-docker-ecr/main.go
+++ b/cmd/drone-docker-ecr/main.go
@@ -55,9 +55,9 @@ func main() {
 	}
 
 	if create {
-		err = ensureRepoExists(svc, strings.TrimPrefix(repo, registry))
+		err = ensureRepoExists(svc, strings.SplitN(repo, "/", 2)[1])
 		if err != nil {
-			os.Exit(1)
+			log.Fatal(fmt.Sprintf("error creating ECR repo: %v", err))
 		}
 	}