Added check to ensure bootstrap ready