CSS/Mandy/Praveena | Added mechanism to handle exception.