diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a397e30..1fa550ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - dev
 
 jobs:
   build:
@@ -33,7 +34,7 @@ jobs:
           prerelease: false
 
       - name: Upload DeathMessages DevBuild
-        #if: github.ref_name == 'nextgen'
+        if: github.ref_name == 'master'
         uses: marvinpinto/action-automatic-releases@master
         with:
           title: "DeathMessages v1.4.18-SNAPSHOT"
@@ -41,3 +42,10 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           files: "Core/build/libs/DeathMessages-*.jar"
           prerelease: true
+
+      - name: Upload DeathMessages Nightly
+        if: github.ref_name == 'dev'
+        uses: actions/upload-artifact@main
+        with:
+          name: DeathMessages-Nightly
+          path: Core/build/libs/DeathMessages-*.jar
diff --git a/Core/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java b/Core/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java
index 0d17a17a..5d81f3eb 100644
--- a/Core/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java
+++ b/Core/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java
@@ -758,7 +758,12 @@ private static void buildHover(Player player, String msg, TextComponent.Builder
 
 			showItem = HoverEvent.showItem(Key.key(i.getType().name().toLowerCase()), i.getAmount(), BinaryTagHolder.binaryTagHolder(NBT.itemStackToNBT(tempItem).getCompound("tag").toString()));
 		} else {
-			showItem = HoverEvent.showItem(Key.key(i.getType().name().toLowerCase()), i.getAmount(), BinaryTagHolder.binaryTagHolder(NBT.itemStackToNBT(i).getCompound("tag").toString()));
+			try {
+				showItem = HoverEvent.showItem(Key.key(i.getType().name().toLowerCase()), i.getAmount(), BinaryTagHolder.binaryTagHolder(NBT.itemStackToNBT(i).getCompound("tag").toString()));
+			} catch (NullPointerException e) {
+				// Item has no `tag` compound in nbt
+				showItem = HoverEvent.showItem(Key.key(i.getType().name().toLowerCase()), i.getAmount());
+			}
 		}
 
 		Component weapon = Component.text()