FIX: Crashes associated with teh passenger generation code in some cases.