Improve error handling and error messaging

Do we want to get the data via the regex instead (as previous), instead of splitting on the slash?