Catching generic Exception in control point

Change-Id: I18511f4209123893ffd462f0ec2ddf2263ea6427
Merge "Catching generic Exception in control point"