Add concrete error codes and error messages