Better handling of empty system names for wormholes