Updated error types