Merge pull request #2446 from karalabe/console-unlock-fix

cmd/utils: fix accounts merge error on console unlock

Author: fjl

cmd/utils/jeth.go

@@ -76,10 +76,9 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
 	if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() {
 		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())
+		} else {
+			passwd, _ = otto.ToValue(input)
 		}
 	} else {
 		if !call.Argument(1).IsString() {