diff --git a/linux/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp
index 6fd0c1c1..4ae3572b 100644
--- a/linux/devices/SusHandler.cpp
+++ b/linux/devices/SusHandler.cpp
@@ -97,20 +97,20 @@ ReturnValue_t SusHandler::buildCommandFromCommand(DeviceCommandId_t deviceComman
 
       rawPacket = cmdBuffer;
       rawPacketLen = 1;
-      return RETURN_OK;
+      break;
     }
     case (SUS::START_INT_TIMED_CONVERSIONS): {
       std::memset(cmdBuffer, 0, sizeof(cmdBuffer));
       cmdBuffer[0] = SUS::CONVERSION;
       rawPacket = cmdBuffer;
       rawPacketLen = 2;
-      return RETURN_OK;
+      break;
     }
     case (SUS::READ_INT_TIMED_CONVERSIONS): {
       std::memset(cmdBuffer, 0, sizeof(cmdBuffer));
       rawPacket = cmdBuffer;
       rawPacketLen = SUS::SIZE_READ_INT_CONVERSIONS;
-      return RETURN_OK;
+      break;
     }
     case (SUS::READ_EXT_TIMED_CONVERSIONS): {
       std::memset(cmdBuffer, 0, sizeof(cmdBuffer));
@@ -120,7 +120,7 @@ ReturnValue_t SusHandler::buildCommandFromCommand(DeviceCommandId_t deviceComman
         cmdBuffer[idx * 2 + 1] = 0;
       }
       rawPacketLen = SUS::SIZE_READ_EXT_CONVERSIONS;
-      return RETURN_OK;
+      break;
     }
     case (SUS::READ_EXT_TIMED_TEMPS): {
       cmdBuffer[0] = buildConvByte(ScanModes::N_ONCE, 0, true);
@@ -132,7 +132,7 @@ ReturnValue_t SusHandler::buildCommandFromCommand(DeviceCommandId_t deviceComman
     default:
       return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
   }
-  return HasReturnvaluesIF::RETURN_FAILED;
+  return HasReturnvaluesIF::RETURN_OK;
 }
 
 void SusHandler::fillCommandAndReplyMap() {