Check if version is empty before concatenating version

The version is not mandatory and often empty. In that case we do not want to end up with a "-" at the end of the string.

@leinir @ngraham