Make worldservice handling more consistent and thereby fix crashing bug