diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 08eebc8df1..e2ae58c8c9 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -49,7 +49,7 @@ obj/machinery/recharger
 			if(!C.battery_module)
 				to_chat(user, "This device does not have a battery installed.")
 				return
-		if(!G.get_cell())
+		else if(!G.get_cell())
 			to_chat(user, "This device does not have a battery installed.")
 			return
 
diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm
index 0eb2a7b065..2496a6930d 100644
--- a/code/modules/modular_computers/hardware/nano_printer.dm
+++ b/code/modules/modular_computers/hardware/nano_printer.dm
@@ -21,10 +21,16 @@
 	if(!check_functionality())
 		return 0
 
+	var/obj/item/weapon/paper/P = new/obj/item/weapon/paper(get_turf(holder2))
+
 	// Damaged printer causes the resulting paper to be somewhat harder to read.
 	if(damage > damage_malfunction)
-		text_to_print = stars(text_to_print, 100-malfunction_probability)
-	new/obj/item/weapon/paper(get_turf(holder2),text_to_print, paper_title)
+		P.info = stars(text_to_print, 100-malfunction_probability)
+	else
+		P.info = text_to_print
+	if(paper_title)
+		P.name = paper_title
+	P.update_icon()
 
 	stored_paper--
 	return 1