diff --git a/profiles/audio/player.c b/profiles/audio/player.c
index 2bd2d6e..c76352e 100644
--- a/profiles/audio/player.c
+++ b/profiles/audio/player.c
@@ -778,19 +778,16 @@ static DBusMessage *media_folder_search(DBusConnection *conn, DBusMessage *msg,
 	dbus_message_iter_init(msg, &iter);
 
 	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
-		return btd_error_failed(msg, strerror(EINVAL));
+		return btd_error_invalid_args(msg);
 
 	dbus_message_iter_get_basic(&iter, &string);
 
-	if (!mp->searchable || folder != mp->folder)
-		return btd_error_failed(msg, strerror(ENOTSUP));
+	if (!mp->searchable || folder != mp->folder || !cb->cbs->search)
+		return btd_error_not_supported(msg);
 
 	if (folder->msg != NULL)
 		return btd_error_failed(msg, strerror(EINVAL));
 
-	if (cb->cbs->search == NULL)
-		return btd_error_failed(msg, strerror(ENOTSUP));
-
 	err = cb->cbs->search(mp, string, cb->user_data);
 	if (err < 0)
 		return btd_error_failed(msg, strerror(-err));
@@ -998,14 +995,14 @@ static DBusMessage *media_folder_change_folder(DBusConnection *conn,
 	if (!dbus_message_get_args(msg, NULL,
 					DBUS_TYPE_OBJECT_PATH, &path,
 					DBUS_TYPE_INVALID))
-		return btd_error_failed(msg, strerror(EINVAL));
+		return btd_error_invalid_args(msg);
 
 	if (folder->msg != NULL)
 		return btd_error_failed(msg, strerror(EBUSY));
 
 	folder = media_player_find_folder(mp, path);
 	if (folder == NULL)
-		return btd_error_failed(msg, strerror(EINVAL));
+		return btd_error_invalid_args(msg);
 
 	if (mp->scope == folder)
 		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
@@ -1017,7 +1014,7 @@ static DBusMessage *media_folder_change_folder(DBusConnection *conn,
 	}
 
 	if (cb->cbs->change_folder == NULL)
-		return btd_error_failed(msg, strerror(ENOTSUP));
+		return btd_error_not_supported(msg);
 
 	err = cb->cbs->change_folder(mp, folder->item->name, folder->item->uid,
 								cb->user_data);
@@ -1473,11 +1470,8 @@ static DBusMessage *media_item_play(DBusConnection *conn, DBusMessage *msg,
 	struct player_callback *cb = mp->cb;
 	int err;
 
-	if (!item->playable)
-		return btd_error_failed(msg, strerror(ENOTSUP));
-
-	if (cb->cbs->play_item == NULL)
-		return btd_error_failed(msg, strerror(ENOTSUP));
+	if (!item->playable || !cb->cbs->play_item)
+		return btd_error_not_supported(msg);
 
 	err = cb->cbs->play_item(mp, item->path, item->uid, cb->user_data);
 	if (err < 0)
@@ -1494,11 +1488,8 @@ static DBusMessage *media_item_add_to_nowplaying(DBusConnection *conn,
 	struct player_callback *cb = mp->cb;
 	int err;
 
-	if (!item->playable)
-		return btd_error_failed(msg, strerror(ENOTSUP));
-
-	if (cb->cbs->play_item == NULL)
-		return btd_error_failed(msg, strerror(ENOTSUP));
+	if (!item->playable || !cb->cbs->play_item)
+		return btd_error_not_supported(msg);
 
 	err = cb->cbs->add_to_nowplaying(mp, item->path, item->uid,
 							cb->user_data);