diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py
index 1d9a261f0b..dba2287b8c 100644
--- a/selfdrive/loggerd/uploader.py
+++ b/selfdrive/loggerd/uploader.py
@@ -72,7 +72,7 @@ def is_on_wifi():
     if result is None:
       return True
     return 'WIFI' in result
-  except (AttributeError, subprocess.CalledProcessError):
+  except Exception:
     cloudlog.exception("is_on_wifi failed")
     return False
 
diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py
index 6c4f298fd4..d2b9ddbdf7 100755
--- a/selfdrive/thermald.py
+++ b/selfdrive/thermald.py
@@ -196,7 +196,7 @@ def thermald_thread():
     if (count % int(10. / DT_TRML)) == 0:
       try:
         network_type = get_network_type()
-      except subprocess.CalledProcessError:
+      except Exception:
         pass
 
     msg.thermal.freeSpace = get_available_percent(default=100.0) / 100.0