diff --git a/core/vm/evm.go b/core/vm/evm.go
index 7f1893001..7ab04d7e8 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -553,7 +553,7 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
 		createDataGas := uint64(len(ret)) * params.CreateDataGas
 		if contract.UseGas(createDataGas) {
 			evm.IntraBlockState.SetCode(address, ret)
-		} else {
+		} else if evm.ChainRules.IsHomestead {
 			err = ErrCodeStoreOutOfGas
 		}
 	}