I went through agonies with this situation (in reverse) when my sons were that age. Do you just send them into the men's changing room (or toilet, depending on what the occasion is) and hope for the best, or take them into the ladies' with you? If there were family changing room available, then certainly he should have waited.