FIX: Possible crash in passenger generation code