diff --git a/power-sequencer/ucd90160.cpp b/power-sequencer/ucd90160.cpp
index 6775dfb..72728e4 100644
--- a/power-sequencer/ucd90160.cpp
+++ b/power-sequencer/ucd90160.cpp
@@ -72,7 +72,7 @@
             createPowerFaultLog();
         }
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         if (!accessError)
         {
@@ -91,7 +91,7 @@
 
         checkPGOODFaults(true);
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         if (!accessError)
         {
@@ -156,7 +156,7 @@
                 nv.add("STATUS_VOUT", vout);
                 nv.add("MFR_STATUS", readMFRStatus());
             }
-            catch (device_error::ReadFailure& e)
+            catch (const device_error::ReadFailure& e)
             {
                 log<level::ERR>("ReadFailure when collecting metadata");
                 commit<device_error::ReadFailure>();
@@ -221,7 +221,7 @@
 
             gpiStatus = gpio->second->read();
         }
-        catch (std::exception& e)
+        catch (const std::exception& e)
         {
             if (!accessError)
             {
@@ -254,7 +254,7 @@
                 nv.add("MFR_STATUS", readMFRStatus());
                 nv.add("INPUT_STATUS", status);
             }
-            catch (device_error::ReadFailure& e)
+            catch (const device_error::ReadFailure& e)
             {
                 log<level::ERR>("ReadFailure when collecting metadata");
                 commit<device_error::ReadFailure>();
@@ -285,7 +285,7 @@
         nv.add("STATUS_WORD", readStatusWord());
         nv.add("MFR_STATUS", readMFRStatus());
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         log<level::ERR>("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
@@ -383,7 +383,7 @@
 
             value = g.read();
         }
-        catch (std::exception& e)
+        catch (const std::exception& e)
         {
             if (!gpioAccessError)
             {
@@ -449,7 +449,7 @@
         nv.add("STATUS_WORD", readStatusWord());
         nv.add("MFR_STATUS", readMFRStatus());
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         log<level::ERR>("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
@@ -471,7 +471,7 @@
         nv.add("STATUS_WORD", readStatusWord());
         nv.add("MFR_STATUS", readMFRStatus());
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         log<level::ERR>("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
@@ -493,7 +493,7 @@
         nv.add("STATUS_WORD", readStatusWord());
         nv.add("MFR_STATUS", readMFRStatus());
     }
-    catch (device_error::ReadFailure& e)
+    catch (const device_error::ReadFailure& e)
     {
         log<level::ERR>("ReadFailure when collecting metadata");
         commit<device_error::ReadFailure>();
