added checks for both reportBaggage & reportPassenger