A couple of further changes:

A couple of further changes:
* Move the empty check up to the top, so the message isn't misleading
* Strip colons out of the names, as this sometimes has odd effects and is probably not so allowed on Windows.
Forgot to mention, last commit included some fragments from the patch by Benjamin Jemlich (http://bugzilla.wikipedia.org/attachment.cgi?id=46)