Added better handling of incorrect passenger information.

Signed-off-by: Florian Bergmann <fbergmann@suse.de>
Fixed some hslint warning about shadowing.

Signed-off-by: Florian Bergmann <fbergmann@suse.de>