Handle this error condition better and tweak some of the formating for the
version string.

Fixes #2162