FC-2751 improved expiry validation