diff --git a/dbus/controller_iface_control.c b/dbus/controller_iface_control.c
index ca3ab038..967cde19 100644
--- a/dbus/controller_iface_control.c
+++ b/dbus/controller_iface_control.c
@@ -87,34 +87,31 @@ jack_control_run_method(
     {
         if (!jack_controller_start_server(controller_ptr, call))
         {
-            jack_error ("Failed to start server");
-        }
-        else
-        {
-            jack_controller_control_send_signal_server_started();
+            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to start server");
+            return true;
         }
+
+        jack_controller_control_send_signal_server_started();
     }
     else if (strcmp (call->method_name, "StopServer") == 0)
     {
         if (!jack_controller_stop_server(controller_ptr, call))
         {
-            jack_error ("Failed to stop server");
-        }
-        else
-        {
-            jack_controller_control_send_signal_server_stopped();
+            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to stop server");
+            return true;
         }
+
+        jack_controller_control_send_signal_server_stopped();
     }
     else if (strcmp (call->method_name, "SwitchMaster") == 0)
     {
         if (!jack_controller_switch_master(controller_ptr, call))
         {
-            jack_error ("Failed to switch master");
-        }
-        else
-        {
-            jack_controller_control_send_signal_server_stopped();
+            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to switch master");
+            return true;
         }
+
+        jack_controller_control_send_signal_server_stopped();
     }
     else if (strcmp (call->method_name, "GetLoad") == 0)
     {