Added small functionality to allow for server/unknown to be handled appropriately.