Added launch error handling