diff --git a/src/kits/media/MediaDefs.cpp b/src/kits/media/MediaDefs.cpp
index d077e7684b..f23feb1343 100644
--- a/src/kits/media/MediaDefs.cpp
+++ b/src/kits/media/MediaDefs.cpp
@@ -1299,12 +1299,12 @@ shutdown_media_server(bigtime_t timeout,
 {
 	BMessage msg(B_QUIT_REQUESTED);
 	BMessage reply;
-	status_t err;
+	status_t err = B_MEDIA_SYSTEM_FAILURE;
 	bool shutdown = false;
 
-	BMediaRoster* roster = BMediaRoster::Roster();
-	if (roster == NULL)
-		return B_ERROR;
+	BMediaRoster* roster = BMediaRoster::Roster(&err);
+	if (roster == NULL || err != B_OK)
+		return err;
 
 	if (progress == NULL && roster->Lock()) {
 		MediaRosterEx(roster)->EnableLaunchNotification(true, true);
diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index 1bef3300af..59e2f2c31f 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -3555,10 +3555,10 @@ BMediaRoster::MessageReceived(BMessage* message)
 			BMessage reply;
 			for (int32 i = 0; i < sSyncedMessages.CountItems(); i++) {
 				SyncedMessage* msg;
-				if (sSyncedMessages.Get(i, &msg) != true)
-					return;
-				msg->message->SendReply(&reply);
-				delete msg->message;
+				if (sSyncedMessages.Get(i, &msg) == true) {
+					msg->message->SendReply(&reply);
+					delete msg->message;
+				}
 				sSyncedMessages.Remove(i);
 			}