Improve error handling in the launcher component