diff --git a/schema/relationship.go b/schema/relationship.go
index bb8aeb64..72e8ab4e 100644
--- a/schema/relationship.go
+++ b/schema/relationship.go
@@ -160,7 +160,8 @@ func (schema *Schema) buildPolymorphicRelation(relation *Relationship, field *Fi
 
 		primaryKeyField := schema.PrioritizedPrimaryField
 		if len(relation.foreignKeys) > 0 {
-			if primaryKeyField = schema.LookUpField(relation.foreignKeys[0]); primaryKeyField == nil || len(relation.foreignKeys) > 1 {
+			primaryKeyField = schema.LookUpField(relation.foreignKeys[0])
+			if primaryKeyField == nil || len(relation.foreignKeys) > 1 {
 				schema.err = fmt.Errorf("invalid polymorphic foreign keys %+v for %v on field %s", relation.foreignKeys, schema, field.Name)
 			}
 		}
diff --git a/tests/callbacks_test.go b/tests/callbacks_test.go
index 2bf9496b..4479da4c 100644
--- a/tests/callbacks_test.go
+++ b/tests/callbacks_test.go
@@ -113,6 +113,9 @@ func TestCallbacks(t *testing.T) {
 
 	for idx, data := range datas {
 		db, err := gorm.Open(nil, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
 		callbacks := db.Callback()
 
 		for _, c := range data.callbacks {
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index 0ac04a04..5872da94 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -102,7 +102,7 @@ func TestTransactionWithBlock(t *testing.T) {
 		return errors.New("the error message")
 	})
 
-	if err.Error() != "the error message" {
+	if err != nil && err.Error() != "the error message" {
 		t.Fatalf("Transaction return error will equal the block returns error")
 	}