diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.h b/src/darwin/Framework/CHIP/MTRDeviceController.h
index 0aaf453a4f545d..91e985fe952c11 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.h
@@ -139,7 +139,7 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
  *
  * Attempts to retreive the generated attestation challenge from a commissionee with the given Device ID.
  * Returns nil if given Device ID does not match an active commissionee, or if a Secure Session is not availale.
-*/
+ */
 - (nullable NSData *)generateAttestationChallengeForDeviceId:(uint64_t)deviceId;
 
 /**
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index a70892d8d247b4..3b2b982240754a 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceController.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -71,8 +71,8 @@
 static NSString * const kErrorGenerateNOC = @"Generating operational certificate failed";
 static NSString * const kErrorKeyAllocation = @"Generating new operational key failed";
 static NSString * const kErrorCSRValidation = @"Extracting public key from CSR failed";
-static NSString * const kErrorGetCommissionee = @"Failure obtaining device being commissioned"
-static NSString * const kErrorGetAttestationChallenge = @"Failure getting attestation challenge"
+static NSString * const kErrorGetCommissionee = @"Failure obtaining device being commissioned";
+static NSString * const kErrorGetAttestationChallenge = @"Failure getting attestation challenge";
 
 @interface MTRDeviceController ()
 
@@ -707,7 +707,7 @@ - (nullable NSData *)computePaseVerifier:(uint32_t)setupPincode iterations:(uint
 
 - (nullable NSData *)generateAttestationChallengeForDeviceId:(uint64_t)deviceId
 {
-    VerifyOrReturn([self checkIsRunning], nil);
+    VerifyOrReturnValue([self checkIsRunning], nil);
 
     __block NSData * attestationChallenge;
     dispatch_sync(_chipWorkQueue, ^{