         if let stop = stopForRow(rowToBeReturned) {
           cell.textLabel?.text = "\(stop.name) (\(stop.id))"
         } else {
-          cell.textLabel?.text = "Unknown stop"
-          log.error("Unknown stop")
+          cell.textLabel?.text = NSLocalizedString("Unknown stop", comment: "")
+          log.error("Unknown stop at row \(rowToBeReturned)")
         }
       }
-  
+      
       return cell
       
     } else { // selectedStop != nil

    if let ref = selectedStop?.ref {
      return currentVehicle?.stopIndexByRef(ref)
    } else {
      return nil
    }
  }
}

// MARK: - UITableViewDataSource
extension MainViewController: UITableViewDataSource {
  
  func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

  
}

//
// MARK: - UITableViewDelegate
//
extension MainViewController: UITableViewDelegate {
  
  func tableView(tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
    stopTableViewHeader = UILabel()
    if selectedStop == nil {
      stopTableViewHeader!.text = NSLocalizedString("Choose your stop", comment: "")
