diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py
index 14bd0960..082c4321 100644
--- a/src/octoprint/printer/standard.py
+++ b/src/octoprint/printer/standard.py
@@ -318,7 +318,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 
 	def set_temperature(self, heater, value):
 		if not PrinterInterface.valid_heater_regex.match(heater):
-			raise ValueError("heater must match \"tool[0-9]+\" or \"bed\": {heater}".format(type=heater))
+			raise ValueError("heater must match \"tool[0-9]+\" or \"bed\": {heater}".format(heater=heater))
 
 		if not isinstance(value, (int, long, float)) or value < 0:
 			raise ValueError("value must be a valid number >= 0: {value}".format(value=value))
@@ -954,7 +954,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 		self._addLog(to_unicode(message, "utf-8", errors="replace"))
 
 	def on_comm_temperature_update(self, temp, bedTemp):
-		self._addTemperatureData(temp, bedTemp)
+		self._addTemperatureData(copy.deepcopy(temp), copy.deepcopy(bedTemp))
 
 	def on_comm_state_change(self, state):
 		"""
diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index 3140d68b..04c868b1 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -2151,6 +2151,7 @@ class MachineCom(object):
 					self._temp[toolNum] = (actual, target)
 				else:
 					self._temp[toolNum] = (None, target)
+				self._callback.on_comm_temperature_update(self._temp, self._bedTemp)
 			except ValueError:
 				pass
 
@@ -2164,6 +2165,7 @@ class MachineCom(object):
 					self._bedTemp = (actual, target)
 				else:
 					self._bedTemp = (None, target)
+				self._callback.on_comm_temperature_update(self._temp, self._bedTemp)
 			except ValueError:
 				pass