diff --git a/pkg/scheduler/generic_scheduler.go b/pkg/scheduler/generic_scheduler.go
index 5624b85094b..77c95ae9742 100644
--- a/pkg/scheduler/generic_scheduler.go
+++ b/pkg/scheduler/generic_scheduler.go
@@ -49,10 +49,10 @@ func (g *genericScheduler) Schedule(pod api.Pod, minionLister MinionLister) (str
 	if len(priorityList) == 0 {
 		return "", fmt.Errorf("failed to find a fit for pod: %v", pod)
 	}
-	return g.selectHost(priorityList)
+	return g.selectHost(priorityList), nil
 }
 
-func (g *genericScheduler) selectHost(priorityList HostPriorityList) (string, error) {
+func (g *genericScheduler) selectHost(priorityList HostPriorityList) string {
 	sort.Sort(priorityList)
 
 	hosts := getMinHosts(priorityList)
@@ -60,7 +60,7 @@ func (g *genericScheduler) selectHost(priorityList HostPriorityList) (string, er
 	defer g.randomLock.Unlock()
 
 	ix := g.random.Int() % len(hosts)
-	return hosts[ix], nil
+	return hosts[ix]
 }
 
 func findNodesThatFit(pod api.Pod, podLister PodLister, predicates []FitPredicate, nodes api.MinionList) (api.MinionList, error) {