CR changes: generic error container