diff --git a/src/DebugToolDrivers/USB/UsbDevice.cpp b/src/DebugToolDrivers/USB/UsbDevice.cpp
index 7867711a..cf47e736 100644
--- a/src/DebugToolDrivers/USB/UsbDevice.cpp
+++ b/src/DebugToolDrivers/USB/UsbDevice.cpp
@@ -49,7 +49,6 @@ namespace Usb
         const int libusbStatusCode = ::libusb_open(this->libusbDevice.get(), &deviceHandle);
 
         if (libusbStatusCode < 0) {
-            // Failed to a device handle from libusb
             throw DeviceInitializationFailure(
                 "Failed to open USB device - error code " + std::to_string(libusbStatusCode) + " returned."
             );
diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp
index 124ef2b4..6949cfdf 100644
--- a/src/TargetController/TargetControllerComponent.cpp
+++ b/src/TargetController/TargetControllerComponent.cpp
@@ -493,8 +493,8 @@ namespace TargetController
 
         if (!this->target->supportsDebugTool(this->debugTool.get())) {
             throw Exceptions::InvalidConfig(
-                "Debug tool (\"" + this->debugTool->getName() + "\") not supported by target (\""
-                    + targetDescriptor.name + "\")."
+                "Debug tool \"" + this->debugTool->getName() + "\" is not compatible with target \""
+                    + targetDescriptor.name + "\"."
             );
         }