Added better error handling, branch support, portal link.