Improved startup problem handling of worker