From 9ff97a98a7449f10db71be88146c5a03d932c373 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 11 Jun 2014 21:51:21 +0200
Subject: [PATCH] Namereg lookup fix

---
 ethpub/pub.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ethpub/pub.go b/ethpub/pub.go
index e00bd0dbef..51426adc58 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -115,9 +115,13 @@ var namereg = ethutil.FromHex("bb5f186604d057c1c5240ca2ae0f6430138ac010")
 func GetAddressFromNameReg(stateManager *ethchain.StateManager, name string) []byte {
 	recp := new(big.Int).SetBytes([]byte(name))
 	object := stateManager.CurrentState().GetStateObject(namereg)
-	reg := object.GetStorage(recp)
+	if object != nil {
+		reg := object.GetStorage(recp)
 
-	return reg.Bytes()
+		return reg.Bytes()
+	}
+
+	return nil
 }
 
 func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, scriptStr string) (*PReceipt, error) {