diff --git a/SilKit/include/silkit/detail/impl/services/lin/LinController.hpp b/SilKit/include/silkit/detail/impl/services/lin/LinController.hpp
index 272c235a0..eb5a643dd 100644
--- a/SilKit/include/silkit/detail/impl/services/lin/LinController.hpp
+++ b/SilKit/include/silkit/detail/impl/services/lin/LinController.hpp
@@ -46,7 +46,7 @@ class LinController : public SilKit::Services::Lin::ILinController
 
     inline void Init(SilKit::Services::Lin::LinControllerConfig config) override;
 
-    inline auto Status() const noexcept -> SilKit::Services::Lin::LinControllerStatus override;
+    inline auto Status() const -> SilKit::Services::Lin::LinControllerStatus override;
 
     inline void SendFrame(SilKit::Services::Lin::LinFrame frame,
                           SilKit::Services::Lin::LinFrameResponseType responseType) override;
@@ -188,12 +188,12 @@ void LinController::Init(SilKit::Services::Lin::LinControllerConfig config)
     ThrowOnError(returnCode);
 }
 
-auto LinController::Status() const noexcept -> SilKit::Services::Lin::LinControllerStatus
+auto LinController::Status() const -> SilKit::Services::Lin::LinControllerStatus
 {
     SilKit_LinControllerStatus status{SilKit_LinControllerStatus_Unknown};
 
     const auto returnCode = SilKit_LinController_Status(_linController, &status);
-    ThrowOnError(returnCode); // will call std::terminate on exception (! because noexcept !)
+    ThrowOnError(returnCode);
 
     return static_cast<SilKit::Services::Lin::LinControllerStatus>(status);
 }
diff --git a/SilKit/include/silkit/services/lin/ILinController.hpp b/SilKit/include/silkit/services/lin/ILinController.hpp
index 0615fa158..d578195c0 100644
--- a/SilKit/include/silkit/services/lin/ILinController.hpp
+++ b/SilKit/include/silkit/services/lin/ILinController.hpp
@@ -96,7 +96,7 @@ class ILinController
     virtual void Init(LinControllerConfig config) = 0;
 
     //! \brief Get the current status of the LIN Controller, i.e., Operational or Sleep.
-    virtual auto Status() const noexcept -> LinControllerStatus = 0;
+    virtual auto Status() const -> LinControllerStatus = 0;
 
     /*! \brief Initiate a LIN data transfer of a given LinFrameResponseType (AUTOSAR LIN master interface)
      *
diff --git a/SilKit/include/silkit/services/orchestration/ISystemMonitor.hpp b/SilKit/include/silkit/services/orchestration/ISystemMonitor.hpp
index 3beb178ed..48a0723cb 100644
--- a/SilKit/include/silkit/services/orchestration/ISystemMonitor.hpp
+++ b/SilKit/include/silkit/services/orchestration/ISystemMonitor.hpp
@@ -32,6 +32,9 @@ namespace Orchestration {
 
 class ISystemMonitor
 {
+public:
+    virtual ~ISystemMonitor() = default;
+
 public:
     /*! Callback type to indicate that a \ref SilKit::Services::Orchestration::SystemState has been received.
     *  Cf., \ref AddSystemStateHandler(SystemStateHandler);