From a702473c5711ab18144913d534f7dc94c02ed503 Mon Sep 17 00:00:00 2001
From: "John C. Vernaleo" <jcv@conformal.com>
Date: Wed, 14 Jan 2015 09:52:23 -0500
Subject: [PATCH] Check for nil to prevent panic.

ok jrick@
---
 rpcserver.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index 0046d1b..7270800 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1697,7 +1697,12 @@ func GetAddressesByAccount(w *Wallet, chainSvr *chain.Client, icmd btcjson.Cmd)
 func GetBalance(w *Wallet, chainSvr *chain.Client, icmd btcjson.Cmd) (interface{}, error) {
 	cmd := icmd.(*btcjson.GetBalanceCmd)
 
-	err := checkAccountName(*cmd.Account)
+	var account string
+	if cmd.Account != nil {
+		account = *cmd.Account
+	}
+
+	err := checkAccountName(account)
 	if err != nil {
 		return nil, err
 	}
@@ -2225,7 +2230,12 @@ func ListSinceBlock(w *Wallet, chainSvr *chain.Client, icmd btcjson.Cmd) (interf
 func ListTransactions(w *Wallet, chainSvr *chain.Client, icmd btcjson.Cmd) (interface{}, error) {
 	cmd := icmd.(*btcjson.ListTransactionsCmd)
 
-	err := checkAccountName(*cmd.Account)
+	var account string
+	if cmd.Account != nil {
+		account = *cmd.Account
+	}
+
+	err := checkAccountName(account)
 	if err != nil {
 		return nil, err
 	}