diff --git a/src/kits/mail/RemoteStorageProtocol.cpp b/src/kits/mail/RemoteStorageProtocol.cpp
index aa1cf48508..3843431e88 100644
--- a/src/kits/mail/RemoteStorageProtocol.cpp
+++ b/src/kits/mail/RemoteStorageProtocol.cpp
@@ -177,6 +177,9 @@ class UpdateHandler : public BHandler {
 							
 							if (dir == NULL)
 								dir = "";
+								
+							if (!_prot->mailboxes.HasItem(dir))
+								break;
 							
 							{
 								node_ref item_ref;
@@ -315,6 +318,9 @@ void BRemoteMailStorageProtocol::SyncMailbox(const char *mailbox) {
 	uint32 chain;
 	bool append;
 	
+	if (!mailboxes.HasItem(mailbox))
+		return; // -- Basic Sanity Checking
+	
 	while (folder.GetNextEntry(&entry) == B_OK) {
 		if (!entry.IsFile())
 			continue;