diff --git a/ipykernel/kernelbase.py b/ipykernel/kernelbase.py
index 0adbd1561..d8c09065c 100644
--- a/ipykernel/kernelbase.py
+++ b/ipykernel/kernelbase.py
@@ -38,8 +38,8 @@
 
 from ._version import kernel_protocol_version
 
-CONTROL_PRIORITY = 1
-SHELL_PRIORITY = 10
+CONTROL_PRIORITY = (1, 'control')
+SHELL_PRIORITY = (10, 'shell')
 
 
 class Kernel(SingletonConfigurable):
@@ -390,7 +390,7 @@ def schedule_dispatch(self, msg, priority, dispatch, stream=None):
         try:
             msg = self.session.deserialize(msg, content=True, copy=False)
         except:
-            self.log.error("Invalid Message", exc_info=True)
+            self.log.error("Invalid %s Message", priority[1], exc_info=True)
             return
 
         new_args = (msg, idents, stream)