Updates to error handling (GS).