[Travel] Forgot a return; This removes some NPEs
[Travel] Fix some warnings from IntelliJ