diff --git a/code/modules/research/artifact_harvester.dm b/code/modules/research/artifact_harvester.dm
index b01bdbf4d0d..bfcacc913c4 100644
--- a/code/modules/research/artifact_harvester.dm
+++ b/code/modules/research/artifact_harvester.dm
@@ -102,16 +102,7 @@
 				mundane++
 				break
 
-		if(articount > 1 || mundane)
-			var/message = "<b>[src]</b> states, \"Cannot harvest. Error isolating energy signature.\""
-			src.visible_message(message, message)
-		else if(!articount)
-			var/message = "<b>[src]</b> states, \"Cannot harvest. No noteworthy energy signature isolated.\""
-			src.visible_message(message, message)
-		else if (cur_artifact.being_used)
-			var/message = "<b>[src]</b> states, \"Cannot harvest. Too much interferance from energy scan.\""
-			src.visible_message(message, message)
-		else
+		if(articount == 1 && !mundane)
 			cur_artifact = analysed
 			//check to see if the battery is compatible
 			if(inserted_battery)
@@ -130,6 +121,15 @@
 			else if(cur_artifact)
 				var/message = "<b>[src]</b> states, \"Cannot harvest. No battery inserted.\""
 				src.visible_message(message, message)
+		else if(articount > 1 || mundane)
+			var/message = "<b>[src]</b> states, \"Cannot harvest. Error isolating energy signature.\""
+			src.visible_message(message, message)
+		else if(!articount)
+			var/message = "<b>[src]</b> states, \"Cannot harvest. No noteworthy energy signature isolated.\""
+			src.visible_message(message, message)
+		else if (cur_artifact.being_used)
+			var/message = "<b>[src]</b> states, \"Cannot harvest. Too much interferance from energy scan.\""
+			src.visible_message(message, message)
 
 	if (href_list["stopharvest"])
 		if(harvesting)