diff --git a/src/kits/interface/Shelf.cpp b/src/kits/interface/Shelf.cpp
index 210bb961d3..7572867c69 100644
--- a/src/kits/interface/Shelf.cpp
+++ b/src/kits/interface/Shelf.cpp
@@ -575,17 +575,17 @@ BShelf::MessageReceived(BMessage *msg)
 				if (err == B_OK )
 					repMessage = ReplicantAt(i, &replicant, &ID, &err);
 				if (err == B_OK && replicant) {
+					msg->PopSpecifier();
 					BMessage archive;
 					err = replicant->Archive(&archive);
-					if (err == B_OK)
+					if (err == B_OK && msg->GetCurrentSpecifier(&index, &specifier, &what, &prop) != B_OK) {
 						err = replyMsg.AddMessage("result", &archive);
-					break;
+						break;
+					}
 					// now handles the replicant suite
 					err = B_BAD_SCRIPT_SYNTAX;
 					if (msg->what != B_GET_PROPERTY)
 						break;
-					if (msg->GetCurrentSpecifier(&index, &specifier, &what, &prop) != B_OK)
-						break;
 					if (strcmp(prop, "ID") == 0) {
 						err = replyMsg.AddInt32("result", ID);
 					} else if (strcmp(prop, "Name") == 0) {