diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 187ed3e2..24727a91 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -32,7 +32,7 @@
 	for (var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_class_name("pill[x]")
+		SL["className"] = assets.icon_class_name("pill[x]") //Hyper edit. Fixes pill icons.
 		pillStyles += list(SL)
 
 	. = ..()
@@ -401,11 +401,7 @@
 					fermianalyze = TRUE
 					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = reagents.has_reagent(R)
-
-					if(!targetReagent)
-						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
-					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = targetReagent.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
+					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = R.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
 				else
 					fermianalyze = FALSE
 					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
@@ -417,7 +413,6 @@
 			. = TRUE
 
 
-
 /obj/machinery/chem_master/proc/end_fermi_reaction()//Ends any reactions upon moving.
 	if(beaker && beaker.reagents.fermiIsReacting)
 		beaker.reagents.fermiEnd()
diff --git a/tgui-next/packages/tgui/interfaces/ChemMaster.js b/tgui-next/packages/tgui/interfaces/ChemMaster.js
index 1997b3b9..40d9ae15 100644
--- a/tgui-next/packages/tgui/interfaces/ChemMaster.js
+++ b/tgui-next/packages/tgui/interfaces/ChemMaster.js
@@ -17,7 +17,9 @@ export const ChemMaster = props => {
     pillBottleCurrentAmount,
     pillBottleMaxAmount,
   } = data;
-
+  if (screen === "analyze") {
+    return <AnalysisResults state={state} />;
+  }
   return (
     <Fragment>
       <Section
@@ -356,9 +358,9 @@ class PackagingControls extends Component {
 }
 
 const AnalysisResults = props => {
-  const { state, fermianalyze } = props;
+  const { state } = props;
   const { ref } = state.config;
-  const { analyzeVars } = state.data;
+  const { analyzeVars, fermianalyze } = state.data;
   return (
     <Section
       title="Analysis Results"