Added a check when terminating to see that there are no currentpassengers to scan.