There is no tension between the two: God's grace and judgement are the same movement; the one implies the other.