diff --git a/Makefile b/Makefile
index f01b8efed..bc63aaf1d 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ build:
 	go build
 
 build_static:
-	go build --ldflags '-extldflags "-static" -X main.version=$(BUILD_NUMBER)' -o drone_static
+	go build --ldflags '-extldflags "-static" -X main.version=$(CI_BUILD_NUMBER)' -o drone_static
 
 test:
 	go test -cover $(PACKAGES)
diff --git a/router/middleware/session/repo.go b/router/middleware/session/repo.go
index ce3dc1f50..258039341 100644
--- a/router/middleware/session/repo.go
+++ b/router/middleware/session/repo.go
@@ -56,7 +56,11 @@ func SetRepo() gin.HandlerFunc {
 		// we can prompt the user to add.
 		if user != nil {
 			remote := context.Remote(c)
-			repo, _ = remote.Repo(user, owner, name)
+			repo, err = remote.Repo(user, owner, name)
+			if err != nil {
+				log.Errorf("Cannot get repository %s/%s for user %s. %s",
+					owner, user.Login, name, err)
+			}
 		}
 
 		data := gin.H{