Launcher update to fix NPE