diff --git a/sendto/main.c b/sendto/main.c
index 1dd3434..b241aac 100644
--- a/sendto/main.c
+++ b/sendto/main.c
@@ -507,7 +507,7 @@ static void create_window(void)
 	gtk_widget_show_all(dialog);
 }
 
-#define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed"
+#define OBEX_CONNECTION_FAILED "org.bluez.obex.Error.ConnectionAttemptFailed"
 
 static gchar *get_error_message(GError *error)
 {
@@ -521,16 +521,22 @@ static gchar *get_error_message(GError *error)
 		goto done;
 	}
 
-	/* FIXME */
-#if 0
-	if (dbus_g_error_has_name(error, OPENOBEX_CONNECTION_FAILED) == TRUE &&
-	    is_palm_device(option_device)) {
-		message = g_strdup(_("Make sure that the remote device "
-					"is switched on and that it "
-					"accepts Bluetooth connections"));
-		goto done;
+	if (g_dbus_error_is_remote_error (error)) {
+		gchar *err;
+		gboolean matches;
+
+		err = g_dbus_error_get_remote_error (error);
+		matches = g_str_equal (err, OBEX_CONNECTION_FAILED);
+		g_free (err);
+
+		if (matches && is_palm_device(option_device)) {
+			message = g_strdup(_("Make sure that the remote device "
+						"is switched on and that it "
+						"accepts Bluetooth connections"));
+			goto done;
+		}
 	}
-#endif
+
 	if (*error->message == '\0')
 		message = g_strdup(_("An unknown error occurred"));
 	else
