1 files changed, 13 insertions, 9 deletions
diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m
index 8f3d188d3..80a9dd4e3 100644
--- a/SmartDeviceLink/SDLPerformAudioPassThru.m
+++ b/SmartDeviceLink/SDLPerformAudioPassThru.m
@@ -27,16 +27,20 @@
 }
 
 - (instancetype)initWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate *)samplingRate maxDuration:(NSNumber *)maxDuration bitsPerSample:(SDLBitsPerSample *)bitsPerSample audioType:(SDLAudioType *)audioType muteAudio:(BOOL)muteAudio {
-    if (self = [self init]) {
-        self.initialPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
-        self.audioPassThruDisplayText1 = audioPassThruDisplayText1;
-        self.audioPassThruDisplayText2 = audioPassThruDisplayText2;
-        self.samplingRate = samplingRate;
-        self.maxDuration = maxDuration;
-        self.bitsPerSample = bitsPerSample;
-        self.audioType = audioType;
-        self.muteAudio = @(muteAudio);
+    self = [self init];
+    if (!self) {
+        return nil;
     }
+    
+    self.initialPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt];
+    self.audioPassThruDisplayText1 = audioPassThruDisplayText1;
+    self.audioPassThruDisplayText2 = audioPassThruDisplayText2;
+    self.samplingRate = samplingRate;
+    self.maxDuration = maxDuration;
+    self.bitsPerSample = bitsPerSample;
+    self.audioType = audioType;
+    self.muteAudio = @(muteAudio);
+
     return self;
 }