STS-3552: Add more null checks to relaunch toolbar update logic