diff --git a/pkg/handler/badges.go b/pkg/handler/badges.go
index 3a98a3fcf..1994d6e5a 100644
--- a/pkg/handler/badges.go
+++ b/pkg/handler/badges.go
@@ -43,26 +43,29 @@ func Badge(w http.ResponseWriter, r *http.Request) error {
 	// get the latest commit from the database
 	// for the requested branch
 	commit, err := database.GetBranch(repo.ID, branchParam)
-	if err == nil {
-		switch {
-		case commit.Status == "Success" && len(successParam) == 0:
-			// if no success image is provided, we serve a
-			// badge using the shields.io service
-			badge = badgeSuccess
-		case commit.Status == "Success" && len(successParam) != 0:
-			// otherwise we serve the user defined success badge
-			badge = successParam
-		case commit.Status == "Failure" && len(failureParam) == 0:
-			// if no failure image is provided, we serve a
-			// badge using the shields.io service
-			badge = badgeFailure
-		case commit.Status == "Failure" && len(failureParam) != 0:
-			// otherwise we serve the user defined failure badge
-			badge = failureParam
-		default:
-			// otherwise load unknown image
-			badge = badgeUnknown
-		}
+	if err != nil {
+		http.NotFound(w, r)
+		return nil
+	}
+
+	switch {
+	case commit.Status == "Success" && len(successParam) == 0:
+		// if no success image is provided, we serve a
+		// badge using the shields.io service
+		badge = badgeSuccess
+	case commit.Status == "Success" && len(successParam) != 0:
+		// otherwise we serve the user defined success badge
+		badge = successParam
+	case commit.Status == "Failure" && len(failureParam) == 0:
+		// if no failure image is provided, we serve a
+		// badge using the shields.io service
+		badge = badgeFailure
+	case commit.Status == "Failure" && len(failureParam) != 0:
+		// otherwise we serve the user defined failure badge
+		badge = failureParam
+	default:
+		// otherwise load unknown image
+		badge = badgeUnknown
 	}
 
 	http.Redirect(w, r, badge, http.StatusSeeOther)