[Travel] Added a null-check
[Shout] Fixing and refactoring

Announcements should work properly now