1 files changed, 10 insertions, 6 deletions
diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index a080c5602..5ded0cddd 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -131,14 +131,21 @@ func (self *StateTransition) TransitionState() (err error) {
 		return NonceError(tx.Nonce, sender.Nonce)
 	}
 
-	// Increment the nonce for the next transaction
-	sender.Nonce += 1
-
 	// Pre-pay gas / Buy gas of the coinbase account
 	if err = self.BuyGas(); err != nil {
 		return err
 	}
 
+	// XXX Transactions after this point are considered valid.
+
+	defer func() {
+		self.state.UpdateStateObject(sender)
+		self.state.UpdateStateObject(receiver)
+	}()
+
+	// Increment the nonce for the next transaction
+	sender.Nonce += 1
+
 	// Get the receiver (TODO fix this, if coinbase is the receiver we need to save/retrieve)
 	receiver = self.Receiver()
 
@@ -187,9 +194,6 @@ func (self *StateTransition) TransitionState() (err error) {
 	remaining := new(big.Int).Mul(self.gas, tx.GasPrice)
 	sender.AddAmount(remaining)
 
-	self.state.UpdateStateObject(sender)
-	self.state.UpdateStateObject(receiver)
-
 	return nil
 }