Fix wait for tallies

election/election.go

@@ -258,7 +258,10 @@ func (election *Election) nextPhase(reason Reason) {
 		// Only tally if we have ballots
 		if election.ballotBox.Size() != 0 {
 			list, err := election.Agreement.TallyList()
-			if err == nil {
+			if err != nil {
+				log.Println("Election: error:", err)
+				log.Println("Election: waiting for tallies from other servers")
+			} else {
 				tally := election.ballotBox.Tally(list)
 				election.Status.TalliedServers[election.ServerID] = true
 				err = election.tallyBox.Put(tally)
@@ -266,9 +269,8 @@ func (election *Election) nextPhase(reason Reason) {
 					panic(err) // Should not happen
 				}
 				election.server.Broadcast(network.NewMessage(MsgTally, tally))
-				break
 			}
-			log.Println("Should really wait for tallies from other servers !!! :D")
+			break
 		}
 
 		fallthrough