Pooja/Melanie | #3744 | Handling exceptions at the view level