Fix for null return of prompt (group name changing)