Added validation for existing application