Preventing NPE
Changed variable to be a Collection instead of List so that
getVehiclesByBlockId() can be consistent and return a Collection.
Many changes to get schedule based predictions fully working.