VE-940: Removing exit statement