diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8099d4dc60..3fe660b2d5 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -49,7 +49,7 @@ import (
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "0.9.39"
+	Version          = "1.0.0"
 )
 
 var (
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 1a703d0840..bf0b723674 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -101,13 +101,8 @@ func NewChainManager(blockDb, stateDb, extraDb common.Database, pow pow.PoW, mux
 
 	bc.genesisBlock = bc.GetBlockByNumber(0)
 	if bc.genesisBlock == nil {
-		// XXX Uncomment me before Frontier
-		//return nil, ErrNoGenesis
-		genesis, err := WriteTestNetGenesisBlock(bc.stateDb, bc.blockDb, 42)
-		if err != nil {
-			glog.Fatalln("genisis err", err)
-		}
-		bc.genesisBlock = genesis
+		// return error if genesis block hasn't been imported
+		return nil, ErrNoGenesis
 	}
 
 	if err := bc.setLastState(); err != nil {