diff --git a/headers/private/media/DataExchange.h b/headers/private/media/DataExchange.h
index e405c218e4..cfa670c700 100644
--- a/headers/private/media/DataExchange.h
+++ b/headers/private/media/DataExchange.h
@@ -197,6 +197,8 @@ public:
 			directory = ref.directory;
 			if(ref.name)
 				strcpy(name, ref.name);
+			else
+				name[0] = 0;
 		}
 private:
 	dev_t	device;
diff --git a/src/kits/media/MediaFiles.cpp b/src/kits/media/MediaFiles.cpp
index 6c21ea613d..b391795b46 100644
--- a/src/kits/media/MediaFiles.cpp
+++ b/src/kits/media/MediaFiles.cpp
@@ -173,6 +173,8 @@ BMediaFiles::GetRefFor(const char *type,
 	
 	rv = QueryServer(SERVER_GETREFFOR, &request, sizeof(request), &reply, sizeof(reply));
 	if (rv != B_OK) {
+		entry_ref ref;
+		*out_ref = ref;
 		ERROR("BMediaFiles::GetRefFor: failed to getreffor (error %#lx)\n", rv);
 		return rv;
 	}