diff --git a/ios/CBPeripheral+Extensions.m b/ios/CBPeripheral+Extensions.m
index 22dd3293..832bac26 100644
--- a/ios/CBPeripheral+Extensions.m
+++ b/ios/CBPeripheral+Extensions.m
@@ -111,8 +111,10 @@ - (NSDictionary *) serializableAdvertisementData: (NSDictionary *) advertisement
     NSLog(@"%@", serviceData);
     
     for (CBUUID *key in [serviceData allKeys]) {
-      [serviceData setObject:dataToArrayBuffer([serviceData objectForKey:key]) forKey:[key UUIDString]];
-      [serviceData removeObjectForKey:key];
+        if ([serviceData objectForKey:key]) {
+            [serviceData setObject:dataToArrayBuffer([serviceData objectForKey:key]) forKey:[key UUIDString]];
+            [serviceData removeObjectForKey:key];
+        }
     }
 
     // replace the Service Data object