diff --git a/cereal b/cereal
index 50d3751489..b9a54adaf4 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit 50d37514897c07ae605691ee602ad6a01b51b890
+Subproject commit b9a54adaf4c825bf2b44d9d60d8e6105eb78e9b1
diff --git a/selfdrive/debug/get_fingerprint.py b/selfdrive/debug/get_fingerprint.py
index 9ece7d7268..2695d457d1 100755
--- a/selfdrive/debug/get_fingerprint.py
+++ b/selfdrive/debug/get_fingerprint.py
@@ -17,6 +17,9 @@ logcan = messaging.sub_sock('can')
 msgs = {}
 while True:
   lc = messaging.recv_sock(logcan, True)
+  if lc is None:
+    continue
+
   for c in lc.can:
     # read also msgs sent by EON on CAN bus 0x80 and filter out the
     # addr with more than 11 bits
diff --git a/selfdrive/debug/internal/measure_modeld_packet_drop.py b/selfdrive/debug/internal/measure_modeld_packet_drop.py
index 457771df0e..2405ee9487 100755
--- a/selfdrive/debug/internal/measure_modeld_packet_drop.py
+++ b/selfdrive/debug/internal/measure_modeld_packet_drop.py
@@ -11,6 +11,9 @@ if __name__ == "__main__":
 
   while True:
     m = messaging.recv_one(modeld_sock)
+    if m is None:
+      continue
+
     frame_id = m.model.frameId
     t = m.logMonoTime / 1e9
     frame_cnt += 1
diff --git a/tools/replay/sensorium.py b/tools/replay/sensorium.py
index 10b2a960d1..4897089b96 100755
--- a/tools/replay/sensorium.py
+++ b/tools/replay/sensorium.py
@@ -26,7 +26,7 @@ if __name__ == "__main__":
 
   while 1:
     fpkt = messaging.recv_one(frame)
-    if len(fpkt.frame.image) == 0:
+    if fpkt is None or len(fpkt.frame.image) == 0:
       continue
     sm.update(timeout=1)
     rgb_img_raw = fpkt.frame.image