diff --git a/src/darwin/Framework/CHIP/MTRDeviceType.mm b/src/darwin/Framework/CHIP/MTRDeviceType.mm
index 998a23e3cdb74a..4cea1d33b9c8dc 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceType.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceType.mm
@@ -45,7 +45,7 @@ - (NSNumber *)id
 
 - (NSString *)name
 {
-    return const_cast<NSString *>(_meta->name);
+    return _meta->name;
 }
 
 - (BOOL)isUtility
diff --git a/src/darwin/Framework/CHIP/MTREndpointInfo.mm b/src/darwin/Framework/CHIP/MTREndpointInfo.mm
index a99950a1a6cf50..c92b525ed99234 100644
--- a/src/darwin/Framework/CHIP/MTREndpointInfo.mm
+++ b/src/darwin/Framework/CHIP/MTREndpointInfo.mm
@@ -164,6 +164,7 @@ + (BOOL)populateChildrenForEndpoints:(NSDictionary<NSNumber *, MTREndpointInfo *
         NSArray<MTRDescriptorClusterDeviceTypeStruct *> * deviceTypeList = MTRDecodeAttributeValue(path, *cache, &err);
         if (!deviceTypeList) {
             MTR_LOG_ERROR("Ignoring invalid DeviceTypeList for endpoint %u: %" CHIP_ERROR_FORMAT, path.mEndpointId, err.Format());
+            // proceed with deviceTypeList == nil, equivalent to an empty list
         }
 
         NSMutableArray * deviceTypes = [[NSMutableArray alloc] initWithCapacity:deviceTypeList.count];