Add missing guard, per CR-ClassRequestTool-4