Fix exception message
Add support for "dev-[branch]" notation