diff --git a/apigee_sync_test.go b/apigee_sync_test.go
index 3d897d6..6dfb0d4 100644
--- a/apigee_sync_test.go
+++ b/apigee_sync_test.go
@@ -181,10 +181,12 @@
 					Expect(true).To(Equal(numApidClusters.Next()))
 					numApidClusters.Scan(&rowCount)
 					Expect(1).To(Equal(rowCount))
+					numApidClusters.Close()
 					apidClusters, _ := db.Query("select id from edgex_apid_cluster;")
 					apidClusters.Next()
 					apidClusters.Scan(&id)
 					Expect(id).To(Equal(expectedClusterId))
+					apidClusters.Close()
 
 					numDataScopes, _ := db.Query("select distinct count(*) from edgex_data_scope;")
 					Expect(true).To(Equal(numDataScopes.Next()))
diff --git a/data.go b/data.go
index 8eefe11..fd4111c 100644
--- a/data.go
+++ b/data.go
@@ -505,7 +505,7 @@
 			info.InstanceID, info.ClusterID, "")
 		info.LastSnapshot = ""
 	}
-	if err != nil {
+	if err == nil {
 		err = tx.Commit()
 		if err != nil {
 			rollbackTxn(tx)