From 40b92cfe70cb1d554f0ef5c68743a4209a02a481 Mon Sep 17 00:00:00 2001
From: Janos Guljas <janos@resenje.org>
Date: Wed, 23 Jan 2019 20:20:35 +0100
Subject: [PATCH] node: return account manager error later in Node.Stop

---
 node/node.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/node/node.go b/node/node.go
index d46de56f45..f24ce3a5ef 100644
--- a/node/node.go
+++ b/node/node.go
@@ -443,10 +443,10 @@ func (n *Node) Stop() error {
 	// unblock n.Wait
 	close(n.stop)
 
+	// Close the accounts manager.
+	var accmanError error
 	if n.accman != nil {
-		if err := n.accman.Close(); err != nil {
-			return err
-		}
+		accmanError = n.accman.Close()
 		n.accman = nil
 	}
 
@@ -459,6 +459,9 @@ func (n *Node) Stop() error {
 	if len(failure.Services) > 0 {
 		return failure
 	}
+	if accmanError != nil {
+		return accmanError
+	}
 	if keystoreErr != nil {
 		return keystoreErr
 	}