diff --git a/Signal/src/phone/signaling/CallConnectUtil_Responder.m b/Signal/src/phone/signaling/CallConnectUtil_Responder.m
index abadc2c37..35571698c 100644
--- a/Signal/src/phone/signaling/CallConnectUtil_Responder.m
+++ b/Signal/src/phone/signaling/CallConnectUtil_Responder.m
@@ -40,7 +40,7 @@
                                                                                     untilCancelled:[callController untilCancelledToken]];
     
     return [futureSignalConnection thenTry:^id(HttpManager* httpManager) {
-        require([httpManager isKindOfClass:httpManager.class]);
+        require([httpManager isKindOfClass:HttpManager.class]);
         
         HttpResponse*(^serverRequestHandler)(HttpRequest*) = ^(HttpRequest* remoteRequest) {
             return [self respondToServerRequest:remoteRequest
diff --git a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m
index 30acdaeb3..3bc2fa96a 100644
--- a/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m	
+++ b/Signal/src/phone/signaling/number directory/PhoneNumberDirectoryFilterManager.m	
@@ -81,8 +81,11 @@
         BloomFilter* filter = [phoneNumberDirectoryFilter bloomFilter];
         NSDate* retryDate = [NSDate dateWithTimeInterval:DIRECTORY_UPDATE_RETRY_PERIOD
                                                sinceDate:[NSDate date]];
-        [PhoneNumberDirectoryFilter phoneNumberDirectoryFilterWithBloomFilter:filter
-                                                                   andExpirationDate:retryDate];
+        @synchronized(self) {
+            phoneNumberDirectoryFilter = [PhoneNumberDirectoryFilter phoneNumberDirectoryFilterWithBloomFilter:filter
+                                                                                            andExpirationDate:retryDate];
+        }
+        
         [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_DIRECTORY_FAILED object:nil];
     }];
 }