Merge branch 'dl/branch-error-message'