Vip Code Update with more exception handling