From 467fc11b723723275f1ebd0fed556a0525ea5f0b Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 12 Mar 2020 16:51:35 +0000
Subject: [PATCH] fix

---
 src/node/utils/toolbar.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/node/utils/toolbar.js b/src/node/utils/toolbar.js
index 67ce12593..2fa9dcf8b 100644
--- a/src/node/utils/toolbar.js
+++ b/src/node/utils/toolbar.js
@@ -68,7 +68,7 @@ ButtonsGroup.prototype.addButton = function (button) {
 };
 
 ButtonsGroup.prototype.render = function () {
-  if (this.buttons.length == 1) {
+  if (this.buttons && this.buttons.length == 1) {
     this.buttons[0].grouping = "";
   }
   else {
@@ -80,7 +80,7 @@ ButtonsGroup.prototype.render = function () {
   }
 
   return _.map(this.buttons, function (btn) {
-    return btn.render();
+    if(btn) return btn.render();
   }).join("\n");
 };
 
@@ -90,11 +90,16 @@ Button = function (attributes) {
 
 Button.load = function (btnName) {
   var button = module.exports.availableButtons[btnName];
-  if (button.constructor === Button || button.constructor === SelectButton) {
-    return button;
-  }
-  else {
-    return new Button(button);
+  try{
+    if (button.constructor === Button || button.constructor === SelectButton) {
+      return button;
+    }
+    else {
+      return new Button(button);
+    }
+  }catch(e){
+    console.warn("Error loading button", btnName);
+    return false;
   }
 };