From abe7f7bc3645257a33079473c3e7351a3eb38d50 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Tue, 28 Mar 2017 16:38:16 -0400
Subject: [PATCH] migration.v17: add nil error check

---
 models/migrations/v17.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index 30067b42f..c6fa18d56 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -12,7 +12,7 @@ import (
 
 func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
 	_, err := x.Exec("DELETE FROM protect_branch_whitelist WHERE protect_branch_id = 0")
-	if strings.Contains(err.Error(), "no such table") {
+	if err != nil && strings.Contains(err.Error(), "no such table") {
 		return nil
 	}
 	return err