This will cause an NPE if the `driver.getLocation()` returns null. Should we be more defensive, to only `put` if it's non-null? Or would that genuinely be an exception?