Bug fix: check if bootstrap is nil