Merge "Improve error handling on branch creation"