Further improved XML builder related to error / exception handling.