3 files changed, 6 insertions, 3 deletions
diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp
index fe07a70a5..39ff90d79 100644
--- a/host/lib/usrp/dboard/db_tvrx2.cpp
+++ b/host/lib/usrp/dboard/db_tvrx2.cpp
@@ -53,6 +53,7 @@
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/msg.hpp>
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/utils/assert_has.hpp>
 #include <uhd/utils/algorithm.hpp>
 #include <uhd/types/ranges.hpp>
@@ -1039,7 +1040,7 @@ tvrx2::~tvrx2(void){
     UHD_LOGV(often) << boost::format(
         "TVRX2 (%s): Called Destructor"
     ) % (get_subdev_name()) << std::endl;
-    if (_enabled) set_disabled();
+    UHD_SAFE_CALL(if (_enabled) set_disabled();)
 }
 
 void tvrx2::set_disabled(void){
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index c775eae38..fcd05ea04 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -50,6 +50,7 @@
 #include "max2829_regs.hpp"
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/static.hpp>
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/utils/assert_has.hpp>
 #include <uhd/utils/algorithm.hpp>
 #include <uhd/types/ranges.hpp>
@@ -234,7 +235,7 @@ xcvr2450::xcvr2450(ctor_args_t args) : xcvr_dboard_base(args){
 }
 
 xcvr2450::~xcvr2450(void){
-    spi_reset();
+    UHD_SAFE_CALL(spi_reset();)
 }
 
 void xcvr2450::spi_reset(void){
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 11b72b9fa..e624ec62f 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -20,6 +20,7 @@
 #include <uhd/usrp/subdev_props.hpp>
 #include <uhd/utils/msg.hpp>
 #include <uhd/utils/log.hpp>
+#include <uhd/utils/safe_call.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/types/dict.hpp>
@@ -351,7 +352,7 @@ void dboard_manager_impl::init(
 }
 
 dboard_manager_impl::~dboard_manager_impl(void){
-    set_nice_dboard_if();
+    UHD_SAFE_CALL(set_nice_dboard_if();)
 }
 
 prop_names_t dboard_manager_impl::get_rx_subdev_names(void){