Added validation for branch & client