diff --git a/src/modules/RFM9x/RFM95.cpp b/src/modules/RFM9x/RFM95.cpp
index 812d928c..72df63c4 100644
--- a/src/modules/RFM9x/RFM95.cpp
+++ b/src/modules/RFM9x/RFM95.cpp
@@ -7,47 +7,30 @@ RFM95::RFM95(Module* mod) : SX1278(mod) {
 int16_t RFM95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint8_t currentLimit, uint16_t preambleLength, uint8_t gain) {
   // execute common part
   int16_t state = SX127x::begin(RFM95_CHIP_VERSION, syncWord, currentLimit, preambleLength);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   // configure settings not accessible by API
   state = config();
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   // configure publicly accessible settings
   state = setFrequency(freq);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setBandwidth(bw);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setSpreadingFactor(sf);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setCodingRate(cr);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setOutputPower(power);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setGain(gain);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+
   return(state);
 }
 
@@ -56,7 +39,7 @@ int16_t RFM95::setFrequency(float freq) {
   if((freq < 868.0) || (freq > 915.0)) {
     return(ERR_INVALID_FREQUENCY);
   }
-  
+
   // set frequency
   return(SX127x::setFrequencyRaw(freq));
 }
diff --git a/src/modules/RFM9x/RFM96.cpp b/src/modules/RFM9x/RFM96.cpp
index e346ee7c..1e045536 100644
--- a/src/modules/RFM9x/RFM96.cpp
+++ b/src/modules/RFM9x/RFM96.cpp
@@ -7,47 +7,30 @@ RFM96::RFM96(Module* mod) : SX1278(mod) {
 int16_t RFM96::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint8_t currentLimit, uint16_t preambleLength, uint8_t gain) {
   // execute common part
   int16_t state = SX127x::begin(RFM9X_CHIP_VERSION, syncWord, currentLimit, preambleLength);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   // configure settings not accessible by API
   state = config();
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   // configure publicly accessible settings
   state = setFrequency(freq);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setBandwidth(bw);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setSpreadingFactor(sf);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setCodingRate(cr);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setOutputPower(power);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+  RADIOLIB_ASSERT(state);
+
   state = setGain(gain);
-  if(state != ERR_NONE) {
-    return(state);
-  }
-  
+
   return(state);
 }
 
@@ -56,7 +39,7 @@ int16_t RFM96::setFrequency(float freq) {
   if((freq < 433.0) || (freq > 470.0)) {
     return(ERR_INVALID_FREQUENCY);
   }
-  
+
   // set frequency
   return(SX127x::setFrequencyRaw(freq));
 }
diff --git a/src/modules/RFM9x/RFM97.cpp b/src/modules/RFM9x/RFM97.cpp
index 8299d654..102fecf9 100644
--- a/src/modules/RFM9x/RFM97.cpp
+++ b/src/modules/RFM9x/RFM97.cpp
@@ -11,7 +11,7 @@ int16_t RFM97::setSpreadingFactor(uint8_t sf) {
   }
 
   uint8_t newSpreadingFactor;
-  
+
   // check allowed spreading factor values
   switch(sf) {
     case 6:
@@ -29,7 +29,7 @@ int16_t RFM97::setSpreadingFactor(uint8_t sf) {
     default:
       return(ERR_INVALID_SPREADING_FACTOR);
   }
-  
+
   // set spreading factor and if successful, save the new setting
   int16_t state = SX1278::setSpreadingFactorRaw(newSpreadingFactor);
   if(state == ERR_NONE) {