Bugfixes for null, empty and '-'-prefixed names