Adding more validation and help messages when the branch structure isn't quite right.