Added more error fields