Added an exit clause
#newsmute-113 In Progress