Merge "Catch exception to prevent Launcher crash." into main