Improved error checking
Improved error checking

maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum,maran/go-ethereum