From eb82ca4563cf80bef9b520673d3bd18283da3a1f Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 21 Jun 2015 20:33:51 +0100
Subject: [PATCH] rpc/js coinbase returns null if no etherbase set

---
 cmd/geth/js_test.go | 4 +---
 xeth/xeth.go        | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index fc2444a7bb..5bdfb70483 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -140,7 +140,7 @@ func TestAccounts(t *testing.T) {
 	defer os.RemoveAll(tmp)
 
 	checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`"]`)
-	checkEvalJSON(t, repl, `eth.coinbase`, `"`+common.Address{}.Hex()+`"`)
+	checkEvalJSON(t, repl, `eth.coinbase`, `null`)
 
 	val, err := repl.re.Run(`personal.newAccount("password")`)
 	if err != nil {
@@ -151,9 +151,7 @@ func TestAccounts(t *testing.T) {
 		t.Errorf("address not hex: %q", addr)
 	}
 
-	// skip until order fixed #824
 	// checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`", "`+addr+`"]`)
-	// checkEvalJSON(t, repl, `eth.coinbase`, `"`+testAddress+`"`)
 }
 
 func TestBlockChain(t *testing.T) {
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 2a1366fe11..84d58a49f1 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -477,7 +477,10 @@ func (self *XEth) IsListening() bool {
 }
 
 func (self *XEth) Coinbase() string {
-	eb, _ := self.backend.Etherbase()
+	eb, err := self.backend.Etherbase()
+	if err != nil {
+		return "0x0"
+	}
 	return eb.Hex()
 }