diff --git a/changelog.md b/changelog.md
index 2959ae2..61fe23e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,14 @@
 # Changelog Material Deck Module
+### V1.0.1 - 26-11-2020
+<ul>
+<li>Fixed issue where macro from macroboard wouldn't execute if furnace arguments were not defined</li>
+<li>Fixed issue where soundboard wouldn't save if no previous data existed for that sound</li>
+</ul>
+
+<b>Compatible server app and SD plugin:</b><br>
+Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
+SD plugin v1.0.0 (unchanged): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
+
 ### v1.0.0 - 24-11-2020
 Release
 <ul>
diff --git a/module.json b/module.json
index fcaed69..c151fdc 100644
--- a/module.json
+++ b/module.json
@@ -2,7 +2,7 @@
     "name": "MaterialDeck",
     "title": "Material Deck",
     "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "author": "CDeenen",
     "esmodules": [
       "./MaterialDeck.js"
diff --git a/src/macro.js b/src/macro.js
index ca5f86c..cb83348 100644
--- a/src/macro.js
+++ b/src/macro.js
@@ -196,11 +196,11 @@ export class MacroControl{
         if (macroId != undefined){
             let macro = game.macros.get(macroId);
             if (macro != undefined && macro != null) {
-                const args = game.settings.get(MODULE.moduleName,'macroSettings').args[macroNumber];
+                const args = game.settings.get(MODULE.moduleName,'macroSettings').args;
                 let furnaceEnabled = false;
                 let furnace = game.modules.get("furnace");
                 if (furnace != undefined && furnace.active) furnaceEnabled = true;
-                if (args == "") furnaceEnabled = false;
+                if (args == undefined || args[number] == undefined || args[macroNumber] == "") furnaceEnabled = false;
                 if (furnaceEnabled == false) macro.execute();
                 else {
                     let chatData = {
diff --git a/src/streamDeck.js b/src/streamDeck.js
index 57c3548..569e758 100644
--- a/src/streamDeck.js
+++ b/src/streamDeck.js
@@ -135,6 +135,7 @@ export class StreamDeck{
     }
 
     setTitle(txt,context){
+        if (txt == null || txt == undefined) txt = '';
         txt = this.formatTitle(txt);
         for (let i=0; i<32; i++){
             if (this.buttonContext[i] == undefined) continue;
@@ -183,6 +184,7 @@ export class StreamDeck{
     }
 
     setIcon(iconLocation, context,src='',background = '#000000',ring=0,ringColor = "#000000",overlay=false){
+        if (src == null || src == undefined) src = '';
         for (let i=0; i<32; i++){
             if (this.buttonContext[i] == undefined) continue;
             if (this.buttonContext[i].context == context) {