From 2371274ac9f6165a92acc5b9e4f05739a6f89f46 Mon Sep 17 00:00:00 2001
From: Gustave Monce <gustave.monce@outlook.com>
Date: Sun, 22 Dec 2019 13:23:53 +0100
Subject: [PATCH] Fix issue with label mode and Terminal commands

---
 ViewModels/NokiaLabelViewModel.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ViewModels/NokiaLabelViewModel.cs b/ViewModels/NokiaLabelViewModel.cs
index e1229a7..342fff7 100644
--- a/ViewModels/NokiaLabelViewModel.cs
+++ b/ViewModels/NokiaLabelViewModel.cs
@@ -79,13 +79,16 @@ namespace WPinternals
             Params.Add("Challenge", Challenge);
             Params.Add("AsicIndex", 0);
             byte[] TerminalResponseBytes = CurrentModel.ExecuteJsonMethodAsBytes("TerminalChallenge", Params, "TerminalResponse");
-            TerminalResponse TerminalResponse = Terminal.Parse(TerminalResponseBytes, 0);
-            if (TerminalResponse != null)
+            if (TerminalResponseBytes != null)
             {
-                PublicID = TerminalResponse.PublicId;
-                LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
-                RootKeyHash = TerminalResponse.RootKeyHash;
-                LogFile.Log("RootKeyHash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                TerminalResponse TerminalResponse = Terminal.Parse(TerminalResponseBytes, 0);
+                if (TerminalResponse != null)
+                {
+                    PublicID = TerminalResponse.PublicId;
+                    LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
+                    RootKeyHash = TerminalResponse.RootKeyHash;
+                    LogFile.Log("RootKeyHash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                }
             }
 
             ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251