Better handling of missing branch info
Minor bug fix