diff --git a/tests/src/dbus_environment.hpp b/tests/src/dbus_environment.hpp
index e483fe7..6a961e6 100644
--- a/tests/src/dbus_environment.hpp
+++ b/tests/src/dbus_environment.hpp
@@ -38,7 +38,7 @@
     }
 
     template <class T>
-    static std::optional<T> waitForFuture(
+    static T waitForFuture(
         std::future<T> future,
         std::chrono::milliseconds timeout = std::chrono::seconds(10))
     {
@@ -49,25 +49,17 @@
         {
             synchronizeIoc();
 
-            try
+            if (future.wait_for(precission) == std::future_status::ready)
             {
-                if (future.wait_for(precission) == std::future_status::ready)
-                {
-                    return future.get();
-                }
-                else
-                {
-                    elapsed += precission;
-                }
+                return future.get();
             }
-            catch (const std::future_error& e)
+            else
             {
-                std::cerr << e.what() << "\n";
-                return {};
+                elapsed += precission;
             }
         }
 
-        return {};
+        throw std::runtime_error("Timed out while waiting for future");
     }
 
     static bool waitForFuture(