diff --git a/projects/roctracer/src/util/exception.h b/projects/roctracer/src/roctracer/exception.h
similarity index 79%
rename from projects/roctracer/src/util/exception.h
rename to projects/roctracer/src/roctracer/exception.h
index 2a791a184d..a2a33a0361 100644
--- a/projects/roctracer/src/util/exception.h
+++ b/projects/roctracer/src/roctracer/exception.h
@@ -18,8 +18,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE. */
 
-#ifndef SRC_UTIL_EXCEPTION_H_
-#define SRC_UTIL_EXCEPTION_H_
+#ifndef EXCEPTION_H_
+#define EXCEPTION_H_
 
 #include <sstream>
 #include <stdexcept>
@@ -29,22 +29,22 @@
   do {                                                                                             \
     std::ostringstream oss;                                                                        \
     oss << __FUNCTION__ << "(), " << stream;                                                       \
-    throw roctracer::util::exception(error, oss.str());                                            \
+    throw roctracer::ApiError(error, oss.str());                                                   \
   } while (false)
 
-namespace roctracer::util {
+namespace roctracer {
 
-template <class Status> class exception : public std::runtime_error {
+class ApiError : public std::runtime_error {
  public:
-  explicit exception(Status status, const std::string& what_arg)
+  explicit ApiError(roctracer_status_t status, const std::string& what_arg)
       : std::runtime_error(what_arg), status_(status) {}
 
-  Status status() const noexcept { return status_; }
+  roctracer_status_t status() const noexcept { return status_; }
 
  private:
-  const Status status_;
+  const roctracer_status_t status_;
 };
 
-}  // namespace roctracer::util
+}  // namespace roctracer
 
-#endif  // SRC_UTIL_EXCEPTION_H_
+#endif  // EXCEPTION_H_
diff --git a/projects/roctracer/src/roctracer/memory_pool.h b/projects/roctracer/src/roctracer/memory_pool.h
index d2e453e343..d23b195841 100644
--- a/projects/roctracer/src/roctracer/memory_pool.h
+++ b/projects/roctracer/src/roctracer/memory_pool.h
@@ -21,8 +21,6 @@
 #ifndef MEMORY_POOL_H_
 #define MEMORY_POOL_H_
 
-#include "util/exception.h"
-
 #include <cassert>
 #include <condition_variable>
 #include <cstdlib>
diff --git a/projects/roctracer/src/roctracer/roctracer.cpp b/projects/roctracer/src/roctracer/roctracer.cpp
index e80e4a901e..655bc48b48 100644
--- a/projects/roctracer/src/roctracer/roctracer.cpp
+++ b/projects/roctracer/src/roctracer/roctracer.cpp
@@ -40,7 +40,7 @@
 #include "loader.h"
 #include "memory_pool.h"
 #include "tracker.h"
-#include "util/exception.h"
+#include "exception.h"
 #include "util/logger.h"
 
 #define PUBLIC_API __attribute__((visibility("default")))
@@ -181,8 +181,7 @@ struct ActivityJournalData {
 static Journal<ActivityJournalData> act_journal;
 
 roctracer_status_t GetExcStatus(const std::exception& e) {
-  const util::exception<roctracer_status_t>* roctracer_exc_ptr =
-      dynamic_cast<const util::exception<roctracer_status_t>*>(&e);
+  const ApiError* roctracer_exc_ptr = dynamic_cast<const ApiError*>(&e);
   return (roctracer_exc_ptr) ? roctracer_exc_ptr->status() : ROCTRACER_STATUS_ERROR;
 }
 
diff --git a/projects/roctracer/src/roctracer/tracker.h b/projects/roctracer/src/roctracer/tracker.h
index b957d64e79..5c7e5329bd 100644
--- a/projects/roctracer/src/roctracer/tracker.h
+++ b/projects/roctracer/src/roctracer/tracker.h
@@ -28,7 +28,7 @@
 
 #include <atomic>
 
-#include "util/exception.h"
+#include "exception.h"
 #include "util/logger.h"
 
 namespace roctracer {
diff --git a/projects/roctracer/src/tracer_tool/tracer_tool.cpp b/projects/roctracer/src/tracer_tool/tracer_tool.cpp
index d1bc6d8267..78fefc5f73 100644
--- a/projects/roctracer/src/tracer_tool/tracer_tool.cpp
+++ b/projects/roctracer/src/tracer_tool/tracer_tool.cpp
@@ -41,7 +41,6 @@
 #include <roctracer_hsa.h>
 #include <roctracer_hip.h>
 
-#include "util/exception.h"
 #include "util/xml.h"
 #include "loader.h"
 #include "trace_buffer.h"
@@ -847,16 +846,10 @@ void tool_load() {
     uint32_t ctrl_len = 0;
     uint32_t ctrl_rate = 0;
 
-    if (sscanf(ctrl_str, "%d:%d:%d", &ctrl_delay, &ctrl_len, &ctrl_rate) != 3) {
-      fprintf(stderr,
-              "ROCTracer: Invalid ROCP_CTRL_RATE var(%s), expected ctrl_delay:ctrl_len:ctrl_rate",
-              ctrl_str);
-      abort();
-    }
-    if (ctrl_len > ctrl_rate) {
-      fprintf(stderr, "ROCTracer: Control length value %u > rate value %u", ctrl_len, ctrl_rate);
-      abort();
-    }
+    if (sscanf(ctrl_str, "%d:%d:%d", &ctrl_delay, &ctrl_len, &ctrl_rate) != 3 ||
+        ctrl_len > ctrl_rate)
+      fatal("Invalid ROCP_CTRL_RATE variable (ctrl_delay:ctrl_len:ctrl_rate)");
+
     control_dist_us = ctrl_rate - ctrl_len;
     control_len_us = ctrl_len;
     control_delay_us = ctrl_delay;