Adding controller exception handling

and fixing code smells

Change-Id: Icd5c64b910eeae0a063466f3f996e0292d02a2f9
Issue-ID: SO-4068
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
6 files changed