diff --git a/system/scripts/gm/gm-monitor.js b/system/scripts/gm/gm-monitor.js
index d76416b..b69bd66 100644
--- a/system/scripts/gm/gm-monitor.js
+++ b/system/scripts/gm/gm-monitor.js
@@ -267,7 +267,7 @@ export class GmMonitor extends FormApplication {
         const display = (e) => {
             return (
                 e.name +
-                ` (<i class="fas fa-arrows-alt-h"> ${e.data.data.range || 0}</i>` +
+                ` (<i class="fas fa-arrows-alt-h"> ${e.data.data.range}</i>` +
                 ` / <i class="fas fa-tint"> ${e.data.data.damage}</i>` +
                 ` / <i class="fas fa-skull"> ${e.data.data.deadliness}</i>)`
             );
diff --git a/system/scripts/item.js b/system/scripts/item.js
index 80416de..c055501 100644
--- a/system/scripts/item.js
+++ b/system/scripts/item.js
@@ -78,6 +78,13 @@ export class ItemL5r5e extends Item {
                 this.addEmbedItem(item, { save: false, newId: false, addBonusToActor: false });
             });
         }
+
+        // Sanitize some values
+        if (this.data.type === "weapon") {
+            this.data.data.range = this.data.data.range || 0;
+            this.data.data.damage = this.data.data.damage || 0;
+            this.data.data.deadliness = this.data.data.deadliness || 0;
+        }
     }
 
     // ***** parent ids management *****