Fix handling of empty string

Starting morning work with an issue :-)