From cf4f3e5c75f86096678b1b62cf834a7ab2d060aa Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 12 Apr 2016 17:01:25 +0200
Subject: [PATCH] cmd/utils: fix personal.unlockAccount rebase issue

---
 cmd/utils/jeth.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmd/utils/jeth.go b/cmd/utils/jeth.go
index 708d457c66..5eae6ddc17 100644
--- a/cmd/utils/jeth.go
+++ b/cmd/utils/jeth.go
@@ -77,9 +77,8 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
 		fmt.Printf("Unlock account %s\n", account)
 		if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil {
 			return otto.FalseValue()
-			passwd, _ = otto.ToValue(input)
 		} else {
-			throwJSExeception(err.Error())
+			passwd, _ = otto.ToValue(input)
 		}
 	} else {
 		if !call.Argument(1).IsString() {