         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

  private func unexpandStopTableView() {
    expandStopTableViewByOffset(0)

//    if let currentVehicleHeaderView = vehicleScrollView.viewAtIndex(currentVehicleIndex) {
//      currentVehicleHeaderView.alpha = 1
//      currentVehicleHeaderView.transform = CGAffineTransformIdentity
//    }

  }
  
  private func resetVehicleScrollView() {

    if let ref = selectedStop?.ref {
      return currentVehicle?.stopIndexByRef(ref)
    } else {
      log.warning("Current vehicle does not currenly have this stop")
      return nil
    }
  }
}

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