diff --git a/src/modules/XBee/XBee.cpp b/src/modules/XBee/XBee.cpp
index 5c38a433..e8c1ceb7 100644
--- a/src/modules/XBee/XBee.cpp
+++ b/src/modules/XBee/XBee.cpp
@@ -173,9 +173,7 @@ int16_t XBee::setPanId(uint8_t* panId) {
 
   // get response code
   int16_t state = readApiFrame(frameID, 4);
-  if(state != ERR_NONE) {
-    return(state);
-  }
+  RADIOLIB_ASSERT(state);
 
   // confirm changes
   return(confirmChanges());
@@ -343,9 +341,7 @@ int16_t XBee::confirmChanges() {
 
   // get response code
   int16_t state = readApiFrame(frameID, 4);
-  if(state != ERR_NONE) {
-    return(state);
-  }
+  RADIOLIB_ASSERT(state);
 
   // apply changes
   frameID = _frameID++;
@@ -353,9 +349,6 @@ int16_t XBee::confirmChanges() {
 
   // get response code
   state = readApiFrame(frameID, 4);
-  if(state != ERR_NONE) {
-    return(state);
-  }
 
   return(state);
 }