diff --git a/satrs-core/src/power.rs b/satrs-core/src/power.rs
index fa8ee01..513b479 100644
--- a/satrs-core/src/power.rs
+++ b/satrs-core/src/power.rs
@@ -49,11 +49,8 @@ pub trait PowerSwitcher {
     /// Retrieve the switch state
     fn get_switch_state(&mut self, switch_id: SwitchId) -> Result<SwitchState, Self::Error>;
 
-    fn get_is_switch_on(&mut self, switch_id: SwitchId) -> Result<bool, ()> {
-        match self.get_switch_state(switch_id) {
-            Ok(switch_state) => { Ok(switch_state == SwitchState::On) }
-            Err(_) => { Err(()) }
-        }
+    fn get_is_switch_on(&mut self, switch_id: SwitchId) -> Result<bool, Self::Error> {
+        Ok(self.get_switch_state(switch_id)? == SwitchState::On)
     }
 
     /// The maximum delay it will take to change a switch.