diff --git a/controller/northbound/server/auth.go b/controller/northbound/server/auth.go
index a10e7a49d6a315ebca45ce8972b4b81a4af5c663..9924e5da49b87105acac7d42f1c264a8ecb1e87c 100644
--- a/controller/northbound/server/auth.go
+++ b/controller/northbound/server/auth.go
@@ -155,7 +155,7 @@ func (s AuthServer) isCorrectPassword(storedPassword, salt, loginPassword string
 }
 
 // handleLogout checks if the provided user name matches with the one associated with token and
-// removed the token from all tokens of the user
+// removed the token from all tokens of the user.
 func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {
@@ -183,7 +183,10 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
 		foundToken := false
 		for _, storedToken := range storedTokens {
 			if storedToken == token {
-				storedUser.RemoveToken(token)
+				err := storedUser.RemoveToken(token)
+				if err != nil {
+					return status.Errorf(codes.Aborted, "error checking match of token provied for user")
+				}
 				foundToken = true
 				break
 			}