refactoring in passenger spec. Add some error exceptions