Update error message based on S2 tech review