diff --git a/waddrmgr/db.go b/waddrmgr/db.go
index 7c092b03b5..98ddc3304c 100644
--- a/waddrmgr/db.go
+++ b/waddrmgr/db.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	// LatestMgrVersion is the most recent manager version.
-	LatestMgrVersion = 4
+	LatestMgrVersion = 5
 )
 
 var (
@@ -1995,20 +1995,18 @@ func upgradeToVersion5(namespace walletdb.Namespace) error {
 // and name indexes and rebuils them, if required, to make sure that the
 // indexes are consistent
 func CheckIndexes(namespace walletdb.Namespace) error {
-	err := namespace.Update(func(tx walletdb.Tx) error {
+	return namespace.Update(func(tx walletdb.Tx) error {
 		bucket := tx.RootBucket().Bucket(acctBucketName)
 
-		bucket.ForEach(func(k, v []byte) error {
+		return bucket.ForEach(func(k, v []byte) error {
 			account := binary.LittleEndian.Uint32(k)
 			if v == nil {
-				fmt.Printf("account #%d: missing account data", account)
 				return nil
 			}
 
 			row, err := deserializeAccountRow(k, v)
 			if err != nil {
-				fmt.Printf("account #%d: %v\n", account, err.Error())
-				return nil
+				return err
 			}
 
 			switch row.acctType {
@@ -2016,8 +2014,7 @@ func CheckIndexes(namespace walletdb.Namespace) error {
 				// Fetch the name from the account row
 				acctInfo, err := deserializeBIP0044AccountRow(k, row)
 				if err != nil {
-					fmt.Printf("account #%d: %v\n", account, err.Error())
-					return nil
+					return err
 				}
 				name := acctInfo.name
 
@@ -2026,8 +2023,7 @@ func CheckIndexes(namespace walletdb.Namespace) error {
 				oldName, _ := fetchAccountName(tx, account)
 				if oldName != name {
 					if err := putAccountIDIndex(tx, account, name); err != nil {
-						fmt.Printf("account #%d: %v\n", account, err.Error())
-						return nil
+						return err
 					}
 					fmt.Printf("account #%d: fixed invalid id index - "+
 						"'%s' -> '%s'\n", account, oldName, name)
@@ -2036,8 +2032,7 @@ func CheckIndexes(namespace walletdb.Namespace) error {
 				oldAccount, _ := fetchAccountByName(tx, name)
 				if oldAccount != account {
 					if err := putAccountNameIndex(tx, account, name); err != nil {
-						fmt.Printf("account #%d: %v\n", account, err.Error())
-						return nil
+						return err
 					}
 					fmt.Printf("account '%s': fixed invalid name index - "+
 						"#%d -> #%d\n", name, oldAccount, account)
@@ -2045,7 +2040,5 @@ func CheckIndexes(namespace walletdb.Namespace) error {
 			}
 			return nil
 		})
-		return nil
 	})
-	return err
 }