Moved validity check to uncommitted value