More defensive passenger searching