From 019f225e84b95d149945e8457c3b7b51b0b8b44d Mon Sep 17 00:00:00 2001
From: Walid Kayhan <walid.kayhan@outlook.com>
Date: Wed, 21 Feb 2024 14:03:41 -0500
Subject: [PATCH] Add guard to error variable which can sometimes be null

---
 src/server/controllers/Grbl/GrblController.js       | 2 +-
 src/server/controllers/Grblhal/GrblHalController.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/controllers/Grbl/GrblController.js b/src/server/controllers/Grbl/GrblController.js
index cb274923d..7bf88bfa5 100644
--- a/src/server/controllers/Grbl/GrblController.js
+++ b/src/server/controllers/Grbl/GrblController.js
@@ -770,7 +770,7 @@ class GrblController {
                 const line = lines[received] || '';
 
                 const preferences = store.get('preferences') || { showLineWarnings: false };
-                this.emit('serialport:read', `error:${code} (${error.message})`);
+                this.emit('serialport:read', `error:${code} (${error?.message})`);
 
                 if (error) {
                     if (preferences.showLineWarnings === false) {
diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js
index d6005fba8..c6a76aa4f 100644
--- a/src/server/controllers/Grblhal/GrblHalController.js
+++ b/src/server/controllers/Grblhal/GrblHalController.js
@@ -743,7 +743,7 @@ class GrblHalController {
             this.emit('error', {
                 type: ERROR,
                 code: `${code}`,
-                description: error?.description || '',
+                description: _.get(error, 'description', ''),
                 line: line,
                 lineNumber: isFileError ? received + 1 : '',
                 origin: errorOrigin,
@@ -756,7 +756,7 @@ class GrblHalController {
                 const line = lines[received] || '';
 
                 const preferences = store.get('preferences') || { showLineWarnings: false };
-                this.emit('serialport:read', `error:${code} (${error.message})`);
+                this.emit('serialport:read', `error:${code} (${error?.message})`);
 
                 if (error) {
                     if (preferences.showLineWarnings === false) {