fix a couple of npes

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Current logic for calculating carpools

Signed-off-by: Umair Khan <omerjerk@gmail.com>