Fix Sonar Qube Violations

Immediately return expression

Issue-ID: CPS-475
Change-Id: I2c33c94bef1ff097786299d3a037feea2b4ebbff
Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
1 file changed