FUL-306: Remove the scope for Exception