Bug-fix for a location without hostname