diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp
index cdda7ac7f8..5896cce3c1 100644
--- a/src/kits/app/Handler.cpp
+++ b/src/kits/app/Handler.cpp
@@ -178,6 +178,8 @@ BHandler::Archive(BMessage *data, bool deep) const
 	if (status < B_OK)
 		return status;
 
+	if (!fName)
+		return B_OK;
 	return data->AddString(kArchiveNameField, fName);
 }