diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java b/core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java
index b351ca4..8d33bdd 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/messaging/MessageBroker.java
@@ -6,6 +6,7 @@ import io.nats.client.Dispatcher;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
@@ -73,4 +74,11 @@ public class MessageBroker {
         var response = nats.request(subject, DocumentRepository.toBytes(document)).join();
         return ResultRepository.fromDocument(DocumentRepository.fromMessage(response));
     }
+
+    public static <S> S unwrap(Result<S, String> result, String message) {
+        Optional<String> err = result.getFailure();
+        if (err.isPresent())
+            throw new RuntimeException(message + ": " + err.orElseThrow());
+        return result.getSuccess().orElseThrow();
+    }
 }
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java b/core-lib/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java
new file mode 100644
index 0000000..e26ec2f
--- /dev/null
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/messaging/RemoteException.java
@@ -0,0 +1,7 @@
+package de.kentoj.scrowlib.messaging;
+
+public class RemoteException extends RuntimeException {
+    public RemoteException(String message) {
+        super(message);
+    }
+}
diff --git a/core-lib/src/main/java/de/kentoj/scrowlib/utils/ResultUtils.java b/core-lib/src/main/java/de/kentoj/scrowlib/utils/ResultUtils.java
index 4d1c491..6f36aa0 100644
--- a/core-lib/src/main/java/de/kentoj/scrowlib/utils/ResultUtils.java
+++ b/core-lib/src/main/java/de/kentoj/scrowlib/utils/ResultUtils.java
@@ -8,10 +8,4 @@ import java.util.Optional;
 
 @NoArgsConstructor(access = AccessLevel.NONE)
 public class ResultUtils {
-    public static <S> S unwrap(Result<S, String> result, String message) {
-        Optional<String> err = result.getFailure();
-        if (err.isPresent())
-            throw new RuntimeException(message + ": " + err.orElseThrow());
-        return result.getSuccess().orElseThrow();
-    }
 }