Fix handling of empty string

Start morning work with an issue :-)