Fixed up existing errors and added a custom Dvd error.