12 files changed, 36 insertions, 0 deletions
diff --git a/src/objc/imap/MCOIMAPAppendMessageOperation.mm b/src/objc/imap/MCOIMAPAppendMessageOperation.mm
index 678fb79d..16463016 100644
--- a/src/objc/imap/MCOIMAPAppendMessageOperation.mm
+++ b/src/objc/imap/MCOIMAPAppendMessageOperation.mm
@@ -48,6 +48,9 @@ typedef void (^CompletionType)(NSError *error, uint32_t createdUID);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, op->createdUID());
diff --git a/src/objc/imap/MCOIMAPCapabilityOperation.mm b/src/objc/imap/MCOIMAPCapabilityOperation.mm
index 8e103bbc..048475c9 100644
--- a/src/objc/imap/MCOIMAPCapabilityOperation.mm
+++ b/src/objc/imap/MCOIMAPCapabilityOperation.mm
@@ -44,6 +44,9 @@ typedef void (^CompletionType)(NSError *error, MCOIndexSet * capabilities);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->capabilities()));
diff --git a/src/objc/imap/MCOIMAPCopyMessagesOperation.mm b/src/objc/imap/MCOIMAPCopyMessagesOperation.mm
index 8ac94c4e..8f7bf501 100644
--- a/src/objc/imap/MCOIMAPCopyMessagesOperation.mm
+++ b/src/objc/imap/MCOIMAPCopyMessagesOperation.mm
@@ -45,6 +45,9 @@ typedef void (^CompletionType)(NSError *error, MCOIndexSet * destUids);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->destUids()));
diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.mm b/src/objc/imap/MCOIMAPFetchContentOperation.mm
index 1f84d9d8..984751c0 100644
--- a/src/objc/imap/MCOIMAPFetchContentOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchContentOperation.mm
@@ -48,6 +48,9 @@ typedef void (^CompletionType)(NSError *error, NSData * data);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->data()));
diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
index 7e33efe2..09b75131 100644
--- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm
@@ -49,6 +49,9 @@ typedef void (^CompletionType)(NSError *error, NSArray *folder);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->folders()));
diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.mm b/src/objc/imap/MCOIMAPFetchMessagesOperation.mm
index 6aca50c2..e43a46e5 100644
--- a/src/objc/imap/MCOIMAPFetchMessagesOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.mm
@@ -44,6 +44,9 @@ typedef void (^CompletionType)(NSError *error, NSArray * messages, MCOIndexSet *
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->messages()), MCO_TO_OBJC(op->vanishedMessages()));
diff --git a/src/objc/imap/MCOIMAPFetchNamespaceOperation.mm b/src/objc/imap/MCOIMAPFetchNamespaceOperation.mm
index cc3a7473..aaa02c96 100644
--- a/src/objc/imap/MCOIMAPFetchNamespaceOperation.mm
+++ b/src/objc/imap/MCOIMAPFetchNamespaceOperation.mm
@@ -44,6 +44,9 @@ typedef void (^CompletionType)(NSError *error, NSDictionary * namespaces);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->namespaces()));
diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.mm b/src/objc/imap/MCOIMAPFolderInfoOperation.mm
index f896eac8..93e032c4 100644
--- a/src/objc/imap/MCOIMAPFolderInfoOperation.mm
+++ b/src/objc/imap/MCOIMAPFolderInfoOperation.mm
@@ -45,6 +45,9 @@ typedef void (^CompletionType)(NSError *error, MCOIMAPFolderInfo *info);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         MCOIMAPFolderInfo * info = [MCOIMAPFolderInfo info];
diff --git a/src/objc/imap/MCOIMAPIdentityOperation.mm b/src/objc/imap/MCOIMAPIdentityOperation.mm
index ab4dab6a..58c258af 100644
--- a/src/objc/imap/MCOIMAPIdentityOperation.mm
+++ b/src/objc/imap/MCOIMAPIdentityOperation.mm
@@ -44,6 +44,9 @@ typedef void (^CompletionType)(NSError *error, NSDictionary * serverIdentity);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->serverIdentity()));
diff --git a/src/objc/imap/MCOIMAPIdleOperation.mm b/src/objc/imap/MCOIMAPIdleOperation.mm
index 76591d72..86419b75 100644
--- a/src/objc/imap/MCOIMAPIdleOperation.mm
+++ b/src/objc/imap/MCOIMAPIdleOperation.mm
@@ -44,6 +44,9 @@ typedef void (^CompletionType)(NSError *error);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil);
diff --git a/src/objc/imap/MCOIMAPOperation.mm b/src/objc/imap/MCOIMAPOperation.mm
index e0938fd3..7b98c6bd 100644
--- a/src/objc/imap/MCOIMAPOperation.mm
+++ b/src/objc/imap/MCOIMAPOperation.mm
@@ -33,6 +33,9 @@ typedef void (^CompletionType)(NSError *error);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     NSError * error = [NSError mco_errorWithErrorCode:MCO_NATIVE_INSTANCE->error()];
     _completionBlock(error);
 }
diff --git a/src/objc/imap/MCOIMAPSearchOperation.mm b/src/objc/imap/MCOIMAPSearchOperation.mm
index a8eaf937..92f57b62 100644
--- a/src/objc/imap/MCOIMAPSearchOperation.mm
+++ b/src/objc/imap/MCOIMAPSearchOperation.mm
@@ -45,6 +45,9 @@ typedef void (^CompletionType)(NSError *error, MCOIndexSet * searchResult);
 }
 
 - (void)operationCompleted {
+    if (_completionBlock == NULL)
+        return;
+    
     nativeType *op = MCO_NATIVE_INSTANCE;
     if (op->error() == mailcore::ErrorNone) {
         _completionBlock(nil, MCO_TO_OBJC(op->uids()));