diff --git a/panels/bed_mesh.py b/panels/bed_mesh.py
index a88a5c41..48e56de4 100644
--- a/panels/bed_mesh.py
+++ b/panels/bed_mesh.py
@@ -151,10 +151,6 @@ class BedMeshPanel(ScreenPanel):
             self.add_profile(prof[9:])
 
     def process_update(self, action, data):
-        if action == "notify_gcode_response":
-            if "must home axis first" in data.lower():
-                self._screen.show_popup_message("Must home axis first.")
-
         if action == "notify_status_update":
             if "bed_mesh" in data and "profile_name" in data['bed_mesh']:
                 logger.debug("bed_mesh: %s" % data)
diff --git a/screen.py b/screen.py
index 30697dc5..1c352dfe 100644
--- a/screen.py
+++ b/screen.py
@@ -354,6 +354,8 @@ class KlipperScreen(Gtk.Window):
 
             if not (data.startswith("B:") and
                 re.search(r'B:[0-9\.]+\s/[0-9\.]+\sT[0-9]+:[0-9\.]+', data)):
+                if data.startswith("!! "):
+                    self.show_popup_message(data[3:])
                 logger.debug(json.dumps([action, data], indent=2))
 
         for sub in self.subscriptions: