better branch/tag handling and downgrade not-configured from an exception