     if TentStatus.Helpers.isCurrentEntity(entity)
       client = @currentEntityClient(options)
       @entity_mapping[entity] = client
-      return callback(client)
+      return callback?(client)
 
     # Following proxy broken atm
     options.skip_following_check = true

        middleware: [].concat(@middleware.tent)
      }, options.client_options)
      @entity_mapping[entity] = client
      return callback(client)

    if (cid = TentStatus.Models.Profile.entity_mapping[entity]) && (profile = TentStatus.Models.Profile.find(cid: cid, fetch: false))
      if profile.get('servers').length

    }, options.client_options)

    @entity_mapping[entity] = client
    callback?(client)

