Fixed GetBlock when no block can be found

1 files changed, 9 insertions, 1 deletions

diff --git a/ethpub/pub.go b/ethpub/pub.go
index 5dc08160f..64109dbfa 100644
--- a/ethpub/pub.go
+++ b/ethpub/pub.go
@@ -24,7 +24,15 @@ func (lib *PEthereum) GetBlock(hexHash string) *PBlock {
 
 	block := lib.blockChain.GetBlock(hash)
 
-	return &PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
+	var blockInfo *PBlock
+
+	if block != nil {
+		blockInfo = &PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
+	} else {
+		blockInfo = &PBlock{Number: -1, Hash: ""}
+	}
+
+	return blockInfo
 }
 
 func (lib *PEthereum) GetKey() *PKey {