diff --git a/build.properties b/build.properties
index 7df46c21..b5b678fb 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 #Sun Apr 09 14:41:44 WEST 2023
 mapping_channel=parchment
 mod_id=psi
-forge_version=47.1.47
+forge_version=47.3.0
 jei_version=15.2.0.27
 build_number=102
 patchy_version=1.20.1-83-FORGE
diff --git a/src/main/java/vazkii/psi/client/gui/GuiCADAssembler.java b/src/main/java/vazkii/psi/client/gui/GuiCADAssembler.java
index 6c7aec01..0df61323 100644
--- a/src/main/java/vazkii/psi/client/gui/GuiCADAssembler.java
+++ b/src/main/java/vazkii/psi/client/gui/GuiCADAssembler.java
@@ -53,7 +53,7 @@ protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
 		int color = 4210752;
 
 		String name = new ItemStack(ModBlocks.cadAssembler).getHoverName().getString();
-		graphics.drawString(this.font, name, imageWidth / 2 - font.width(name) / 2, 10, color);
+		graphics.drawString(this.font, name, imageWidth / 2 - font.width(name) / 2, 10, color, false);
 
 		ItemStack cad = assembler.getCachedCAD(player);
 		if(!cad.isEmpty()) {
diff --git a/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java b/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java
index 5a9869de..e352ca18 100644
--- a/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java
+++ b/src/main/java/vazkii/psi/common/core/handler/ContributorSpellCircleHandler.java
@@ -69,7 +69,7 @@ public static boolean isContributor(String name) {
 
 	@SubscribeEvent
 	public static void onCadTake(CADTakeEvent event) {
-		if(ContributorSpellCircleHandler.isContributor(event.getPlayer().getName().getString().toLowerCase(Locale.ROOT)) && !((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE).isEmpty()) {
+		if(ContributorSpellCircleHandler.isContributor(event.getPlayer().getName().getString().toLowerCase(Locale.ROOT)) && !event.getCad().isEmpty() && !((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE).isEmpty()) {
 			ItemStack dyeStack = ((ICAD) event.getCad().getItem()).getComponentInSlot(event.getCad(), EnumCADComponent.DYE);
 			((ICADColorizer) dyeStack.getItem()).setContributorName(dyeStack, event.getPlayer().getName().getString());
 			ItemCAD.setComponent(event.getCad(), dyeStack);